Add separate audio and video popup menus

bindings/java/org/videolan/jvlc/VideoIntf.java

 /*
  * Created on 28-feb-2006
  *
- * $Id: VideoIntf.java 8 2006-02-28 12:03:47Z little $
+ * $Id$
  *
  * This program is free software; you can redistribute it
  * and/or modify it under the terms of the GNU General Public License

include/vlc_interface.h

@@ -162,6 +162,9 @@ VLC_EXPORT( void,              intf_Destroy,    ( intf_thread_t * ) );
 #define INTF_DIALOG_BOOKMARKS  14
 
 #define INTF_DIALOG_POPUPMENU  20
+#define INTF_DIALOG_AUDIOPOPUPMENU  21
+#define INTF_DIALOG_VIDEOPOPUPMENU  22
+#define INTF_DIALOG_MISCPOPUPMENU  23
 
 #define INTF_DIALOG_FILE_GENERIC 30
 #define INTF_DIALOG_INTERACTION 50

modules/gui/wxwidgets/dialogs.cpp

@@ -84,6 +84,9 @@ private:
     void OnOpenSat( wxCommandEvent& event );
 
     void OnPopupMenu( wxCommandEvent& event );
+    void OnAudioPopupMenu( wxCommandEvent& event );
+    void OnVideoPopupMenu( wxCommandEvent& event );
+    void OnMiscPopupMenu( wxCommandEvent& event );
 
     void OnIdle( wxIdleEvent& event );
 
@@ -140,8 +143,16 @@ BEGIN_EVENT_TABLE(DialogsProvider, wxFrame)
                 DialogsProvider::OnFileInfo)
     EVT_COMMAND(INTF_DIALOG_BOOKMARKS, wxEVT_DIALOG,
                 DialogsProvider::OnBookmarks)
+
     EVT_COMMAND(INTF_DIALOG_POPUPMENU, wxEVT_DIALOG,
                 DialogsProvider::OnPopupMenu)
+    EVT_COMMAND(INTF_DIALOG_AUDIOPOPUPMENU, wxEVT_DIALOG,
+                DialogsProvider::OnAudioPopupMenu)
+    EVT_COMMAND(INTF_DIALOG_VIDEOPOPUPMENU, wxEVT_DIALOG,
+                DialogsProvider::OnVideoPopupMenu)
+    EVT_COMMAND(INTF_DIALOG_MISCPOPUPMENU, wxEVT_DIALOG,
+                DialogsProvider::OnMiscPopupMenu)
+
     EVT_COMMAND(INTF_DIALOG_EXIT, wxEVT_DIALOG,
                 DialogsProvider::OnExitThread)
     EVT_COMMAND(INTF_DIALOG_UPDATEVLC, wxEVT_DIALOG,
@@ -508,6 +519,22 @@ void DialogsProvider::OnPopupMenu( wxCommandEvent& event )
     ::PopupMenu( p_intf, this, mousepos );
 }
 
+void DialogsProvider::OnAudioPopupMenu( wxCommandEvent& event )
+{
+    wxPoint mousepos = ScreenToClient( wxGetMousePosition() );
+    ::AudioPopupMenu( p_intf, this, mousepos );
+}
+void DialogsProvider::OnVideoPopupMenu( wxCommandEvent& event )
+{
+    wxPoint mousepos = ScreenToClient( wxGetMousePosition() );
+    ::VideoPopupMenu( p_intf, this, mousepos );
+}
+void DialogsProvider::OnMiscPopupMenu( wxCommandEvent& event )
+{
+    wxPoint mousepos = ScreenToClient( wxGetMousePosition() );
+    ::MiscPopupMenu( p_intf, this, mousepos );
+}
+
 void DialogsProvider::OnExitThread( wxCommandEvent& WXUNUSED(event) )
 {
     wxTheApp->ExitMainLoop();

modules/gui/wxwidgets/interface.hpp

@@ -239,6 +239,9 @@ namespace wxvlc
 };
 
 void PopupMenu( intf_thread_t *, wxWindow *, const wxPoint& );
+void AudioPopupMenu( intf_thread_t *, wxWindow *, const wxPoint& );
+void VideoPopupMenu( intf_thread_t *, wxWindow *, const wxPoint& );
+void MiscPopupMenu( intf_thread_t *, wxWindow *, const wxPoint& );
 wxMenu *SettingsMenu( intf_thread_t *, wxWindow *, wxMenu * = NULL );
 wxMenu *AudioMenu( intf_thread_t *, wxWindow *, wxMenu * = NULL );
 wxMenu *VideoMenu( intf_thread_t *, wxWindow *, wxMenu * = NULL );