Deactivated VLM control by wx while I clean it. (It uses private fields

of VLM that should not have been public)

diff --git a/modules/gui/wxwidgets/dialogs.cpp b/modules/gui/wxwidgets/dialogs.cpp
index 3abe162f3e3276c6fe9958ec2ef86b1d9b260e5b..4efb9d3b73fc5fb58e0bfe0f673e142b36590b64 100644 (file)
--- a/modules/gui/wxwidgets/dialogs.cpp
+++ b/modules/gui/wxwidgets/dialogs.cpp
@@ -35,7 +35,7 @@
 
 #include "vlc_charset.h"
 
-#include "dialogs/vlm/vlm_panel.hpp"
+//#include "dialogs/vlm/vlm_panel.hpp"
 #include "dialogs/bookmarks.hpp"
 #include "dialogs/wizard.hpp"
 #include "dialogs/playlist.hpp"
@@ -67,7 +67,7 @@ private:
 
     /* Event handlers (these functions should _not_ be virtual) */
     void OnUpdateVLC( wxCommandEvent& event );
-    void OnVLM( wxCommandEvent& event );
+    //void OnVLM( wxCommandEvent& event );
     void OnInteraction( wxCommandEvent& event );
     void OnExit( wxCommandEvent& event );
     void OnPlaylist( wxCommandEvent& event );
@@ -112,7 +112,7 @@ public:
     wxFrame             *p_bookmarks_dialog;
     wxFileDialog        *p_file_generic_dialog;
     UpdateVLC           *p_updatevlc_dialog;
-    VLMFrame            *p_vlm_dialog;
+    //VLMFrame            *p_vlm_dialog;
 };
 }
 
@@ -161,8 +161,10 @@ BEGIN_EVENT_TABLE(DialogsProvider, wxFrame)
                 DialogsProvider::OnExitThread)
     EVT_COMMAND(INTF_DIALOG_UPDATEVLC, wxEVT_DIALOG,
                 DialogsProvider::OnUpdateVLC)
+#if 0
     EVT_COMMAND(INTF_DIALOG_VLM, wxEVT_DIALOG,
                 DialogsProvider::OnVLM)
+#endif
     EVT_COMMAND( INTF_DIALOG_INTERACTION, wxEVT_DIALOG,
                 DialogsProvider::OnInteraction )
 END_EVENT_TABLE()
@@ -191,7 +193,7 @@ DialogsProvider::DialogsProvider( intf_thread_t *_p_intf, wxWindow *p_parent )
     p_bookmarks_dialog = NULL;
     p_dir_dialog = NULL;
     p_updatevlc_dialog = NULL;
-    p_vlm_dialog = NULL;
+    //p_vlm_dialog = NULL;
 
     /* Give our interface a nice little icon */
     p_intf->p_sys->p_icon = new wxIcon( vlc_xpm );
@@ -263,7 +265,7 @@ DialogsProvider::~DialogsProvider()
     if( p_wizard_dialog ) delete p_wizard_dialog;
     if( p_bookmarks_dialog ) delete p_bookmarks_dialog;
     if( p_updatevlc_dialog ) delete p_updatevlc_dialog;
-    if( p_vlm_dialog ) delete p_vlm_dialog;
+    //if( p_vlm_dialog ) delete p_vlm_dialog;
 
 
     if( p_intf->p_sys->p_icon ) delete p_intf->p_sys->p_icon;
@@ -562,6 +564,7 @@ void DialogsProvider::OnUpdateVLC( wxCommandEvent& WXUNUSED(event) )
     }
 }
 
+#if 0
 void DialogsProvider::OnVLM( wxCommandEvent& WXUNUSED(event) )
 {
     /* Show/hide the file info window */
@@ -573,6 +576,7 @@ void DialogsProvider::OnVLM( wxCommandEvent& WXUNUSED(event) )
         p_vlm_dialog->Show( !p_vlm_dialog->IsShown() );
     }
 }
+#endif
 
 void DialogsProvider::OnInteraction( wxCommandEvent& event )
 {

diff --git a/modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp b/modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp
index f1acd3e6e9a77e43a361eb4f81b916022ce4b2fa..e5b86c8e8a3a431a4dd5d1e2f1e6c8f4088713c9 100644 (file)
--- a/modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp
+++ b/modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp
@@ -21,6 +21,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#if 0
 #include "dialogs/vlm/vlm_panel.hpp"
 #include "dialogs/vlm/vlm_wrapper.hpp"
 #include "dialogs/vlm/vlm_stream.hpp"
@@ -576,3 +577,5 @@ VLMEditStreamFrame::VLMEditStreamFrame( intf_thread_t *_p_intf,
 VLMEditStreamFrame::~VLMEditStreamFrame()
 {
 }
+#endif
+

diff --git a/modules/gui/wxwidgets/dialogs/vlm/vlm_slider_manager.cpp b/modules/gui/wxwidgets/dialogs/vlm/vlm_slider_manager.cpp
index 542d6f6c429c49d6c7305cc1719a534945b40ea5..66e8817d7bc525fdbaffa9888b96dbd1d2d02f38 100644 (file)
--- a/modules/gui/wxwidgets/dialogs/vlm/vlm_slider_manager.cpp
+++ b/modules/gui/wxwidgets/dialogs/vlm/vlm_slider_manager.cpp
@@ -24,6 +24,7 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#if 0
 #include "dialogs/vlm/vlm_slider_manager.hpp"
 #include "dialogs/vlm/vlm_stream.hpp"
 #include "dialogs/vlm/vlm_streampanel.hpp"
@@ -216,3 +217,4 @@ void VLMSliderManager::ProcessUpdate( wxScrollEvent &event )
 
 #undef WIN32
 }
+#endif

diff --git a/modules/gui/wxwidgets/dialogs/vlm/vlm_stream.cpp b/modules/gui/wxwidgets/dialogs/vlm/vlm_stream.cpp
index 12202060749212827ba89603aa2b12a3ee94fc38..a34ddbdf1ccb7ba22d3eac43838b67e72b94033d 100644 (file)
--- a/modules/gui/wxwidgets/dialogs/vlm/vlm_stream.cpp
+++ b/modules/gui/wxwidgets/dialogs/vlm/vlm_stream.cpp
@@ -21,6 +21,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#if 0
 #include "dialogs/vlm/vlm_stream.hpp"
 #include "dialogs/vlm/vlm_wrapper.hpp"
 
@@ -108,3 +109,4 @@ VLMVODStream::VLMVODStream( intf_thread_t *_p_intf, vlm_media_t *_p_media,
 VLMVODStream::~VLMVODStream()
 {
 }
+#endif

diff --git a/modules/gui/wxwidgets/dialogs/vlm/vlm_streampanel.cpp b/modules/gui/wxwidgets/dialogs/vlm/vlm_streampanel.cpp
index b0bf50c1456741cbe05dcaea4c4e57a2f9ba2b70..488e3173240957fdaf018f8df778751d333940d0 100644 (file)
--- a/modules/gui/wxwidgets/dialogs/vlm/vlm_streampanel.cpp
+++ b/modules/gui/wxwidgets/dialogs/vlm/vlm_streampanel.cpp
@@ -21,6 +21,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#if 0
 #include "dialogs/vlm/vlm_streampanel.hpp"
 #include "dialogs/vlm/vlm_stream.hpp"
 #include "dialogs/vlm/vlm_slider_manager.hpp"
@@ -201,3 +202,4 @@ VLMVODStreamPanel::VLMVODStreamPanel( intf_thread_t* _p_intf,
 VLMVODStreamPanel::~VLMVODStreamPanel()
 {
 }
+#endif

diff --git a/modules/gui/wxwidgets/dialogs/vlm/vlm_wrapper.cpp b/modules/gui/wxwidgets/dialogs/vlm/vlm_wrapper.cpp
index 920853f00dc9a25f7e698ca50fbc6da8a99d9d89..88c8962458ad1512d3594963559f222ce5aca76d 100644 (file)
--- a/modules/gui/wxwidgets/dialogs/vlm/vlm_wrapper.cpp
+++ b/modules/gui/wxwidgets/dialogs/vlm/vlm_wrapper.cpp
@@ -23,6 +23,7 @@
 
 /* FIXME: This is not wx-specific */
 
+#if 0
 #include "dialogs/vlm/vlm_wrapper.hpp"
 
 VLMWrapper::VLMWrapper( intf_thread_t *_p_intf )
@@ -131,3 +132,5 @@ void VLMWrapper::EditVod( const char* name, const char* input,
         vlm_MessageDelete( message );
     }
 }
+#endif
+

diff --git a/modules/gui/wxwidgets/interface.cpp b/modules/gui/wxwidgets/interface.cpp
index c2e3c4fba5226cb646a9b4bef3aa763cf9ba3638..cceb843edc3098d45b15c8818dae18f1f0a9b316 100644 (file)
--- a/modules/gui/wxwidgets/interface.cpp
+++ b/modules/gui/wxwidgets/interface.cpp
@@ -301,7 +301,7 @@ enum
     OnWebLink_Event,
     OnWebHelp_Event,
     UpdateVLC_Event,
-    VLM_Event,
+    //VLM_Event,
 
     Iconize_Event,
 };
@@ -315,7 +315,7 @@ BEGIN_EVENT_TABLE(Interface, wxFrame)
     EVT_MENU(OnWebLink_Event, Interface::OnWebLink)
     EVT_MENU(OnWebHelp_Event, Interface::OnWebHelp)
     EVT_MENU(UpdateVLC_Event, Interface::OnShowDialog)
-    EVT_MENU(VLM_Event, Interface::OnShowDialog)
+    //EVT_MENU(VLM_Event, Interface::OnShowDialog)
 
     EVT_MENU(Playlist_Event, Interface::OnShowDialog)
     EVT_MENU(PlaylistSmall_Event, Interface::OnSmallPlaylist)
@@ -600,8 +600,10 @@ void Interface::CreateOurMenuBar()
     view_menu->Append( Logs_Event, wxU(_("&Messages...\tCtrl-M")) );
     view_menu->Append( FileInfo_Event,
                        wxU(_("Stream and Media &Info...\tCtrl-I")) );
+#if 0
     view_menu->Append( VLM_Event,
                        wxU(_("VLM Control...\tCtrl-V")) );
+#endif
 
     /* Create the "Auto-generated" menus */
     p_settings_menu = SettingsMenu( p_intf, this );
@@ -1027,9 +1029,11 @@ void Interface::OnShowDialog( wxCommandEvent& event )
         case UpdateVLC_Event:
             i_id = INTF_DIALOG_UPDATEVLC;
             break;
+#if 0
         case VLM_Event:
             i_id = INTF_DIALOG_VLM;
             break;
+#endif
         default:
             i_id = INTF_DIALOG_FILE;
             break;