Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
4758ccba
Commit
4758ccba
authored
Sep 27, 2004
by
Gildas Bazin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* modules/gui/wxwindows/*: work-around a wxwindows bug with accelerators registration on win32.
parent
e9a6f99b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
0 deletions
+17
-0
modules/gui/wxwindows/interface.cpp
modules/gui/wxwindows/interface.cpp
+6
-0
modules/gui/wxwindows/timer.cpp
modules/gui/wxwindows/timer.cpp
+9
-0
modules/gui/wxwindows/wxwindows.h
modules/gui/wxwindows/wxwindows.h
+2
-0
No files found.
modules/gui/wxwindows/interface.cpp
View file @
4758ccba
...
@@ -279,6 +279,12 @@ Interface::~Interface()
...
@@ -279,6 +279,12 @@ Interface::~Interface()
delete
timer
;
delete
timer
;
}
}
void
Interface
::
Init
()
{
/* Misc init */
SetupHotkeys
();
}
void
Interface
::
Update
()
void
Interface
::
Update
()
{
{
/* Misc updates */
/* Misc updates */
...
...
modules/gui/wxwindows/timer.cpp
View file @
4758ccba
...
@@ -49,6 +49,7 @@ Timer::Timer( intf_thread_t *_p_intf, Interface *_p_main_interface )
...
@@ -49,6 +49,7 @@ Timer::Timer( intf_thread_t *_p_intf, Interface *_p_main_interface )
{
{
p_intf
=
_p_intf
;
p_intf
=
_p_intf
;
p_main_interface
=
_p_main_interface
;
p_main_interface
=
_p_main_interface
;
b_init
=
0
;
i_old_playing_status
=
PAUSE_S
;
i_old_playing_status
=
PAUSE_S
;
i_old_rate
=
INPUT_RATE_DEFAULT
;
i_old_rate
=
INPUT_RATE_DEFAULT
;
...
@@ -90,6 +91,14 @@ Timer::~Timer()
...
@@ -90,6 +91,14 @@ Timer::~Timer()
*****************************************************************************/
*****************************************************************************/
void
Timer
::
Notify
()
void
Timer
::
Notify
()
{
{
#if defined( __WXMSW__ )
/* Work-around a bug with accelerators */
if
(
!
b_init
)
{
p_main_interface
->
Init
();
b_init
=
VLC_TRUE
;
}
#endif
vlc_mutex_lock
(
&
p_intf
->
change_lock
);
vlc_mutex_lock
(
&
p_intf
->
change_lock
);
/* Update the input */
/* Update the input */
...
...
modules/gui/wxwindows/wxwindows.h
View file @
4758ccba
...
@@ -181,6 +181,7 @@ public:
...
@@ -181,6 +181,7 @@ public:
private:
private:
intf_thread_t
*
p_intf
;
intf_thread_t
*
p_intf
;
Interface
*
p_main_interface
;
Interface
*
p_main_interface
;
vlc_bool_t
b_init
;
int
i_old_playing_status
;
int
i_old_playing_status
;
int
i_old_rate
;
int
i_old_rate
;
vlc_bool_t
b_old_seekable
;
vlc_bool_t
b_old_seekable
;
...
@@ -291,6 +292,7 @@ public:
...
@@ -291,6 +292,7 @@ public:
/* Constructor */
/* Constructor */
Interface
(
intf_thread_t
*
p_intf
);
Interface
(
intf_thread_t
*
p_intf
);
virtual
~
Interface
();
virtual
~
Interface
();
void
Init
();
void
TogglePlayButton
(
int
i_playing_status
);
void
TogglePlayButton
(
int
i_playing_status
);
void
Update
();
void
Update
();
...
...
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