vlc/vlc-1.1 | branch: master | Kaarlo Raiha <[email protected]> | Sat Dec  
4 19:31:06 2010 +0200| [49c6bc96c6d34a24b6b1c2e13f020134d03fdefa] | committer: 
Jean-Baptiste Kempf 

support mce remote controllers record button in QT4 GUI win32

Signed-off-by: Jean-Baptiste Kempf <[email protected]>
(cherry picked from commit 70526ce235650b7f39a8abc3c06682bd6a0d7d47)

Signed-off-by: Jean-Baptiste Kempf <[email protected]>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=49c6bc96c6d34a24b6b1c2e13f020134d03fdefa
---

 modules/gui/qt4/actions_manager.hpp      |    2 +-
 modules/gui/qt4/main_interface_win32.cpp |    5 +++++
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/modules/gui/qt4/actions_manager.hpp 
b/modules/gui/qt4/actions_manager.hpp
index fb05481..4dbf06b 100644
--- a/modules/gui/qt4/actions_manager.hpp
+++ b/modules/gui/qt4/actions_manager.hpp
@@ -85,11 +85,11 @@ public slots:
     void AudioUp();
     void AudioDown();
     void play();
+    void record();
 protected slots:
     void fullscreen();
     void snapshot();
     void playlist();
-    void record();
     void frame();
 
     virtual void doAction( int );
diff --git a/modules/gui/qt4/main_interface_win32.cpp 
b/modules/gui/qt4/main_interface_win32.cpp
index 5e13a0d..f29899e 100644
--- a/modules/gui/qt4/main_interface_win32.cpp
+++ b/modules/gui/qt4/main_interface_win32.cpp
@@ -194,15 +194,20 @@ bool MainInterface::winEvent ( MSG * msg, long * result )
                 case APPCOMMAND_MEDIA_PAUSE:
                     THEMIM->pause();
                     break;
+                case APPCOMMAND_MEDIA_CHANNEL_DOWN:
                 case APPCOMMAND_MEDIA_PREVIOUSTRACK:
                     THEMIM->prev();
                     break;
+                case APPCOMMAND_MEDIA_CHANNEL_UP:
                 case APPCOMMAND_MEDIA_NEXTTRACK:
                     THEMIM->next();
                     break;
                 case APPCOMMAND_MEDIA_STOP:
                     THEMIM->stop();
                     break;
+                case APPCOMMAND_MEDIA_RECORD:
+                    THEAM->record();
+                    break;
                 case APPCOMMAND_VOLUME_DOWN:
                     THEAM->AudioDown();
                     break;

_______________________________________________
vlc-commits mailing list
[email protected]
http://mailman.videolan.org/listinfo/vlc-commits

Reply via email to