Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
7b34dfa9
Commit
7b34dfa9
authored
Apr 17, 2006
by
Clément Stenac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add todo
parent
76a63d03
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
7 deletions
+19
-7
modules/gui/skins2/parser/interpreter.cpp
modules/gui/skins2/parser/interpreter.cpp
+2
-0
modules/gui/skins2/src/vlcproc.cpp
modules/gui/skins2/src/vlcproc.cpp
+17
-7
No files found.
modules/gui/skins2/parser/interpreter.cpp
View file @
7b34dfa9
...
@@ -218,6 +218,7 @@ CmdGeneric *Interpreter::parseAction( const string &rAction, Theme *pTheme )
...
@@ -218,6 +218,7 @@ CmdGeneric *Interpreter::parseAction( const string &rAction, Theme *pTheme )
if
(
windowId
==
"playlist_window"
&&
if
(
windowId
==
"playlist_window"
&&
!
config_GetInt
(
getIntf
(),
"skinned-playlist"
)
)
!
config_GetInt
(
getIntf
(),
"skinned-playlist"
)
)
{
{
/// \todo Mux commands: hide_window and dialog playlist to make sure the window is hidden
pCommand
=
new
CmdDlgPlaylist
(
getIntf
()
);
pCommand
=
new
CmdDlgPlaylist
(
getIntf
()
);
}
}
else
else
...
@@ -252,6 +253,7 @@ CmdGeneric *Interpreter::parseAction( const string &rAction, Theme *pTheme )
...
@@ -252,6 +253,7 @@ CmdGeneric *Interpreter::parseAction( const string &rAction, Theme *pTheme )
if
(
windowId
==
"playlist_window"
&&
if
(
windowId
==
"playlist_window"
&&
!
config_GetInt
(
getIntf
(),
"skinned-playlist"
)
)
!
config_GetInt
(
getIntf
(),
"skinned-playlist"
)
)
{
{
/// \todo Mux commands: hide_window and dialog playlist to make sure the window is hidden
pCommand
=
new
CmdDlgPlaylist
(
getIntf
()
);
pCommand
=
new
CmdDlgPlaylist
(
getIntf
()
);
}
}
else
else
...
...
modules/gui/skins2/src/vlcproc.cpp
View file @
7b34dfa9
...
@@ -79,6 +79,8 @@ VlcProc::VlcProc( intf_thread_t *pIntf ): SkinObject( pIntf ),
...
@@ -79,6 +79,8 @@ VlcProc::VlcProc( intf_thread_t *pIntf ): SkinObject( pIntf ),
#define REGISTER_VAR( var, type, name ) \
#define REGISTER_VAR( var, type, name ) \
var = VariablePtr( new type( getIntf() ) ); \
var = VariablePtr( new type( getIntf() ) ); \
pVarManager->registerVar( var, name );
pVarManager->registerVar( var, name );
/* Playlist variables */
REGISTER_VAR
(
m_cPlaylist
,
Playlist
,
"playlist"
)
REGISTER_VAR
(
m_cPlaylist
,
Playlist
,
"playlist"
)
pVarManager
->
registerVar
(
getPlaylistVar
().
getPositionVarPtr
(),
pVarManager
->
registerVar
(
getPlaylistVar
().
getPositionVarPtr
(),
"playlist.slider"
);
"playlist.slider"
);
...
@@ -90,19 +92,27 @@ VlcProc::VlcProc( intf_thread_t *pIntf ): SkinObject( pIntf ),
...
@@ -90,19 +92,27 @@ VlcProc::VlcProc( intf_thread_t *pIntf ): SkinObject( pIntf ),
"playtree.slider"
);
"playtree.slider"
);
pVarManager
->
registerVar
(
m_cVarRandom
,
"playtree.isRandom"
);
pVarManager
->
registerVar
(
m_cVarRandom
,
"playtree.isRandom"
);
pVarManager
->
registerVar
(
m_cVarLoop
,
"playtree.isLoop"
);
pVarManager
->
registerVar
(
m_cVarLoop
,
"playtree.isLoop"
);
pVarManager
->
registerVar
(
m_cVarRepeat
,
"playtree.isRepeat"
);
REGISTER_VAR
(
m_cVarTime
,
StreamTime
,
"time"
)
REGISTER_VAR
(
m_cVarVolume
,
Volume
,
"volume"
)
REGISTER_VAR
(
m_cVarMute
,
VarBoolImpl
,
"vlc.isMute"
)
REGISTER_VAR
(
m_cVarPlaying
,
VarBoolImpl
,
"vlc.isPlaying"
)
REGISTER_VAR
(
m_cVarPlaying
,
VarBoolImpl
,
"vlc.isPlaying"
)
REGISTER_VAR
(
m_cVarStopped
,
VarBoolImpl
,
"vlc.isStopped"
)
REGISTER_VAR
(
m_cVarStopped
,
VarBoolImpl
,
"vlc.isStopped"
)
REGISTER_VAR
(
m_cVarPaused
,
VarBoolImpl
,
"vlc.isPaused"
)
REGISTER_VAR
(
m_cVarPaused
,
VarBoolImpl
,
"vlc.isPaused"
)
/* Input variables */
pVarManager
->
registerVar
(
m_cVarRepeat
,
"playtree.isRepeat"
);
REGISTER_VAR
(
m_cVarTime
,
StreamTime
,
"time"
)
REGISTER_VAR
(
m_cVarSeekable
,
VarBoolImpl
,
"vlc.isSeekable"
)
REGISTER_VAR
(
m_cVarSeekable
,
VarBoolImpl
,
"vlc.isSeekable"
)
REGISTER_VAR
(
m_cVarEqualizer
,
VarBoolImpl
,
"equalizer.isEnabled"
)
REGISTER_VAR
(
m_cVarEqPreamp
,
EqualizerPreamp
,
"equalizer.preamp"
)
REGISTER_VAR
(
m_cVarDvdActive
,
VarBoolImpl
,
"dvd.isActive"
)
REGISTER_VAR
(
m_cVarDvdActive
,
VarBoolImpl
,
"dvd.isActive"
)
/* Vout variables */
REGISTER_VAR
(
m_cVarFullscreen
,
VarBoolImpl
,
"vlc.isFullscreen"
)
REGISTER_VAR
(
m_cVarFullscreen
,
VarBoolImpl
,
"vlc.isFullscreen"
)
REGISTER_VAR
(
m_cVarHasVout
,
VarBoolImpl
,
"vlc.hasVout"
)
REGISTER_VAR
(
m_cVarHasVout
,
VarBoolImpl
,
"vlc.hasVout"
)
/* Aout variables */
REGISTER_VAR
(
m_cVarVolume
,
Volume
,
"volume"
)
REGISTER_VAR
(
m_cVarMute
,
VarBoolImpl
,
"vlc.isMute"
)
REGISTER_VAR
(
m_cVarEqualizer
,
VarBoolImpl
,
"equalizer.isEnabled"
)
REGISTER_VAR
(
m_cVarEqPreamp
,
EqualizerPreamp
,
"equalizer.preamp"
)
#undef REGISTER_VAR
#undef REGISTER_VAR
m_cVarStreamName
=
VariablePtr
(
new
VarText
(
getIntf
(),
false
)
);
m_cVarStreamName
=
VariablePtr
(
new
VarText
(
getIntf
(),
false
)
);
pVarManager
->
registerVar
(
m_cVarStreamName
,
"streamName"
);
pVarManager
->
registerVar
(
m_cVarStreamName
,
"streamName"
);
...
@@ -223,7 +233,7 @@ void VlcProc::dropVout()
...
@@ -223,7 +233,7 @@ void VlcProc::dropVout()
void
VlcProc
::
manage
()
void
VlcProc
::
manage
()
{
{
// Did the user request
ed
to quit vlc ?
// Did the user request to quit vlc ?
if
(
getIntf
()
->
b_die
||
getIntf
()
->
p_vlc
->
b_die
)
if
(
getIntf
()
->
b_die
||
getIntf
()
->
p_vlc
->
b_die
)
{
{
CmdQuit
*
pCmd
=
new
CmdQuit
(
getIntf
()
);
CmdQuit
*
pCmd
=
new
CmdQuit
(
getIntf
()
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment