Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
c7438b1e
Commit
c7438b1e
authored
Mar 20, 2011
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt4: cache var_InheritBool on Win32
parent
2a93fde7
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
2 deletions
+9
-2
modules/gui/qt4/main_interface.cpp
modules/gui/qt4/main_interface.cpp
+5
-0
modules/gui/qt4/main_interface_win32.cpp
modules/gui/qt4/main_interface_win32.cpp
+1
-2
modules/gui/qt4/qt4.hpp
modules/gui/qt4/qt4.hpp
+3
-0
No files found.
modules/gui/qt4/main_interface.cpp
View file @
c7438b1e
...
@@ -122,6 +122,11 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
...
@@ -122,6 +122,11 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
settings
=
getSettings
();
settings
=
getSettings
();
settings
->
beginGroup
(
"MainWindow"
);
settings
->
beginGroup
(
"MainWindow"
);
#ifdef WIN32
/* Volume keys */
p_intf
->
p_sys
->
disable_volume_keys
=
var_InheritBool
(
p_intf
,
"qt-disable-volume-keys"
);
#endif
/* */
/* */
b_plDocked
=
getSettings
()
->
value
(
"pl-dock-status"
,
true
).
toBool
();
b_plDocked
=
getSettings
()
->
value
(
"pl-dock-status"
,
true
).
toBool
();
...
...
modules/gui/qt4/main_interface_win32.cpp
View file @
c7438b1e
...
@@ -183,8 +183,7 @@ bool MainInterface::winEvent ( MSG * msg, long * result )
...
@@ -183,8 +183,7 @@ bool MainInterface::winEvent ( MSG * msg, long * result )
case
WM_APPCOMMAND
:
case
WM_APPCOMMAND
:
cmd
=
GET_APPCOMMAND_LPARAM
(
msg
->
lParam
);
cmd
=
GET_APPCOMMAND_LPARAM
(
msg
->
lParam
);
bool
disable_volume_keys
=
var_InheritBool
(
p_intf
,
"qt-disable-volume-keys"
);
if
(
p_intf
->
p_sys
->
disable_volume_keys
&&
if
(
disable_volume_keys
&&
(
cmd
==
APPCOMMAND_VOLUME_DOWN
||
(
cmd
==
APPCOMMAND_VOLUME_DOWN
||
cmd
==
APPCOMMAND_VOLUME_UP
||
cmd
==
APPCOMMAND_VOLUME_UP
||
cmd
==
APPCOMMAND_VOLUME_MUTE
)
)
cmd
==
APPCOMMAND_VOLUME_MUTE
)
)
...
...
modules/gui/qt4/qt4.hpp
View file @
c7438b1e
...
@@ -74,6 +74,9 @@ struct intf_sys_t
...
@@ -74,6 +74,9 @@ struct intf_sys_t
QString
filepath
;
/* Last path used in dialogs */
QString
filepath
;
/* Last path used in dialogs */
#ifdef WIN32
bool
disable_volume_keys
;
#endif
};
};
#define THEPL pl_Get(p_intf)
#define THEPL pl_Get(p_intf)
...
...
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