* ./modules/gui/win32/*: some cleaning

diff --git a/modules/gui/win32/about.cpp b/modules/gui/win32/about.cpp
index b89ff2be1edd606b52b09bb6c1aa4b9977f1015d..03fc28751c67b4b532c80c4909386ca344410ce0 100644 (file)
--- a/modules/gui/win32/about.cpp
+++ b/modules/gui/win32/about.cpp
@@ -34,13 +34,12 @@
 //#pragma package(smart_init)
 #pragma resource "*.dfm"
 
-extern  intf_thread_t *p_intfGlobal;
-
 //---------------------------------------------------------------------------
-__fastcall TAboutDlg::TAboutDlg( TComponent* Owner )
+__fastcall TAboutDlg::TAboutDlg( TComponent* Owner, intf_thread_t *_p_intf )
         : TForm( Owner )
 {
-    Image1->Picture->Icon = p_intfGlobal->p_sys->p_window->Icon;
+    p_intf = _p_intf;
+    Image1->Picture->Icon = p_intf->p_sys->p_window->Icon;
     LabelVersion->Caption = "Version " VERSION;
     Translate( this );
 }

diff --git a/modules/gui/win32/about.h b/modules/gui/win32/about.h
index d08caa9526fb7e56c884cf43b8f5187616acc4d7..3f3089cea3eccf59dd270e7514771985001dfaba 100644 (file)
--- a/modules/gui/win32/about.h
+++ b/modules/gui/win32/about.h
@@ -43,8 +43,9 @@ __published:  // IDE-managed Components
     TLabel *Label5;\r
     TLabel *LabelVersion;\r
 private:       // User declarations\r
+    intf_thread_t *p_intf;\r
 public:                // User declarations\r
-    __fastcall TAboutDlg( TComponent* Owner );\r
+    __fastcall TAboutDlg( TComponent* Owner, intf_thread_t *_p_intf );\r
 };\r
 //---------------------------------------------------------------------------\r
 #endif\r

diff --git a/modules/gui/win32/disc.cpp b/modules/gui/win32/disc.cpp
index 60b28fde1fcb8c866fe914460b25a28293e77b9d..034099af692d423940b1575b4378d6f20421a4b0 100644 (file)
--- a/modules/gui/win32/disc.cpp
+++ b/modules/gui/win32/disc.cpp
@@ -35,12 +35,11 @@
 #pragma link "CSPIN"\r
 #pragma resource "*.dfm"\r
 \r
-extern  intf_thread_t *p_intfGlobal;\r
-\r
 //---------------------------------------------------------------------------\r
-__fastcall TDiscDlg::TDiscDlg( TComponent* Owner )\r
+__fastcall TDiscDlg::TDiscDlg( TComponent* Owner, intf_thread_t *_p_intf )\r
         : TForm( Owner )\r
 {\r
+    p_intf = _p_intf;\r
     /* Simulate a click to get the correct device name */\r
     RadioGroupTypeClick( RadioGroupType );\r
     Translate( this );\r
@@ -48,12 +47,12 @@ __fastcall TDiscDlg::TDiscDlg( TComponent* Owner )
 //---------------------------------------------------------------------------\r
 void __fastcall TDiscDlg::FormShow( TObject *Sender )\r
 {\r
-    p_intfGlobal->p_sys->p_window->OpenDiscAction->Checked = true;\r
+    p_intf->p_sys->p_window->OpenDiscAction->Checked = true;\r
 }\r
 //---------------------------------------------------------------------------\r
 void __fastcall TDiscDlg::FormHide( TObject *Sender )\r
 {\r
-    p_intfGlobal->p_sys->p_window->OpenDiscAction->Checked = false;\r
+    p_intf->p_sys->p_window->OpenDiscAction->Checked = false;\r
 }\r
 //---------------------------------------------------------------------------\r
 void __fastcall TDiscDlg::BitBtnCancelClick( TObject *Sender )\r
@@ -67,7 +66,7 @@ void __fastcall TDiscDlg::BitBtnOkClick( TObject *Sender )
     playlist_t *    p_playlist;\r
 \r
     p_playlist = (playlist_t *)\r
-        vlc_object_find( p_intfGlobal, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );\r
+        vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );\r
     if( p_playlist == NULL )\r
     {   \r
         return;\r
@@ -97,7 +96,7 @@ void __fastcall TDiscDlg::BitBtnOkClick( TObject *Sender )
                   PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END );\r
 \r
     /* update the display */\r
-    p_intfGlobal->p_sys->p_playwin->UpdateGrid( p_playlist );\r
+    p_intf->p_sys->p_playwin->UpdateGrid( p_playlist );\r
 \r
     vlc_object_release( p_playlist );\r
 }\r
@@ -109,11 +108,11 @@ void __fastcall TDiscDlg::RadioGroupTypeClick( TObject *Sender )
 \r
     if( RadioGroupType->ItemIndex == 0 )\r
     {\r
-        psz_device = config_GetPsz( p_intfGlobal, "dvd" );\r
+        psz_device = config_GetPsz( p_intf, "dvd" );\r
     }\r
     else\r
     {\r
-        psz_device = config_GetPsz( p_intfGlobal, "vcd" );\r
+        psz_device = config_GetPsz( p_intf, "vcd" );\r
     }\r
 \r
     if( psz_device )\r

diff --git a/modules/gui/win32/disc.h b/modules/gui/win32/disc.h
index 1e2646d6066828581679e05dd95f592e3aa02e00..a794495ec4f22d282c0902525d47baf4a6f1a215 100644 (file)
--- a/modules/gui/win32/disc.h
+++ b/modules/gui/win32/disc.h
@@ -45,14 +45,15 @@ __published:        // IDE-managed Components
     TEdit *EditDevice;\r
     TCSpinEdit *SpinEditTitle;\r
     TCSpinEdit *SpinEditChapter;\r
-    void __fastcall FormShow(TObject *Sender);\r
-    void __fastcall FormHide(TObject *Sender);\r
-    void __fastcall BitBtnCancelClick(TObject *Sender);\r
-    void __fastcall BitBtnOkClick(TObject *Sender);\r
-    void __fastcall RadioGroupTypeClick(TObject *Sender);\r
+    void __fastcall FormShow( TObject *Sender );\r
+    void __fastcall FormHide( TObject *Sender );\r
+    void __fastcall BitBtnCancelClick( TObject *Sender );\r
+    void __fastcall BitBtnOkClick( TObject *Sender);\r
+    void __fastcall RadioGroupTypeClick( TObject *Sender );\r
 private:       // User declarations\r
+    intf_thread_t *p_intf;\r
 public:                // User declarations\r
-    __fastcall TDiscDlg( TComponent* Owner );\r
+    __fastcall TDiscDlg( TComponent* Owner, intf_thread_t *_p_intf );\r
 };\r
 //---------------------------------------------------------------------------\r
 #endif\r

diff --git a/modules/gui/win32/mainframe.cpp b/modules/gui/win32/mainframe.cpp
index 3e4f063116bba9ebd9a5fa4443952e4798cbdc5f..bf237372b3edf7a9c15ea3c9298b1667e12777ef 100644 (file)
--- a/modules/gui/win32/mainframe.cpp
+++ b/modules/gui/win32/mainframe.cpp
@@ -46,13 +46,14 @@
 #pragma link "CSPIN"\r
 #pragma resource "*.dfm"\r
 \r
-extern intf_thread_t *p_intfGlobal;\r
 extern int Win32Manage( intf_thread_t *p_intf );\r
 \r
 //---------------------------------------------------------------------------\r
-__fastcall TMainFrameDlg::TMainFrameDlg( TComponent* Owner )\r
-        : TForm( Owner )\r
+__fastcall TMainFrameDlg::TMainFrameDlg(\r
+    TComponent* Owner, intf_thread_t *_p_intf ) : TForm( Owner )\r
 {\r
+    p_intf = _p_intf;\r
+\r
     Application->ShowHint = true;\r
     Application->OnHint = DisplayHint;\r
 \r
@@ -81,7 +82,7 @@ __fastcall TMainFrameDlg::~TMainFrameDlg()
  ****************************************************************************/\r
 void __fastcall TMainFrameDlg::TimerManageTimer( TObject *Sender )\r
 {\r
-    Win32Manage( p_intfGlobal );\r
+    Win32Manage( p_intf );\r
 }\r
 //---------------------------------------------------------------------------\r
 void __fastcall TMainFrameDlg::DisplayHint( TObject *Sender )\r
@@ -95,28 +96,26 @@ void __fastcall TMainFrameDlg::TrackBarChange( TObject *Sender )
      * the stream. It is called whenever the slider changes its value.\r
      * The lock has to be taken before the function is called */\r
 \r
-//    vlc_mutex_lock( &p_intfGlobal->p_sys->p_input->stream.stream_lock );\r
+//    vlc_mutex_lock( &p_intf->p_sys->p_input->stream.stream_lock );\r
 \r
-    if( p_intfGlobal->p_sys->p_input != NULL )\r
+    if( p_intf->p_sys->p_input != NULL )\r
     {\r
-#define p_area p_intfGlobal->p_sys->p_input->stream.p_selected_area\r
+#define p_area p_intf->p_sys->p_input->stream.p_selected_area\r
         char psz_time[ OFFSETTOTIME_MAX_SIZE ];\r
         off_t Value = TrackBar->Position;\r
 \r
         GroupBoxSlider->Caption =\r
-                input_OffsetToTime( p_intfGlobal->p_sys->p_input, psz_time,\r
+                input_OffsetToTime( p_intf->p_sys->p_input, psz_time,\r
                         ( p_area->i_size * Value ) / (off_t)SLIDER_MAX_VALUE );\r
 #undef p_area\r
      }\r
 \r
-//    vlc_mutex_unlock( &p_intfGlobal->p_sys->p_input->stream.stream_lock );\r
+//    vlc_mutex_unlock( &p_intf->p_sys->p_input->stream.stream_lock );\r
 }\r
 //---------------------------------------------------------------------------\r
 void __fastcall TMainFrameDlg::FormClose( TObject *Sender,\r
       TCloseAction &Action )\r
 {\r
-    intf_thread_t *p_intf = p_intfGlobal;\r
-\r
     vlc_mutex_lock( &p_intf->change_lock );\r
     p_intf->p_vlc->b_die = VLC_TRUE;\r
     vlc_mutex_unlock( &p_intf->change_lock );\r
@@ -135,7 +134,7 @@ void __fastcall TMainFrameDlg::OpenFileActionExecute( TObject *Sender )
     AnsiString      FileName;\r
     playlist_t *    p_playlist;\r
 \r
-    p_playlist = (playlist_t *)vlc_object_find( p_intfGlobal,\r
+    p_playlist = (playlist_t *)vlc_object_find( p_intf,\r
                                        VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );\r
     if( p_playlist == NULL )\r
     {\r
@@ -150,7 +149,7 @@ void __fastcall TMainFrameDlg::OpenFileActionExecute( TObject *Sender )
                       PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END );\r
 \r
         /* update the plugin display */\r
-        p_intfGlobal->p_sys->p_playwin->UpdateGrid( p_playlist );\r
+        p_intf->p_sys->p_playwin->UpdateGrid( p_playlist );\r
     };\r
 \r
     vlc_object_release( p_playlist );\r
@@ -158,22 +157,22 @@ void __fastcall TMainFrameDlg::OpenFileActionExecute( TObject *Sender )
 //---------------------------------------------------------------------------\r
 void __fastcall TMainFrameDlg::OpenDiscActionExecute( TObject *Sender )\r
 {\r
-    TDiscDlg *p_disc = p_intfGlobal->p_sys->p_disc;\r
+    TDiscDlg *p_disc = p_intf->p_sys->p_disc;\r
     if( p_disc == NULL )\r
     {\r
-        p_disc = new TDiscDlg( this );\r
-        p_intfGlobal->p_sys->p_disc = p_disc;\r
+        p_disc = new TDiscDlg( this, p_intf );\r
+        p_intf->p_sys->p_disc = p_disc;\r
     }\r
     p_disc->Show();\r
 }\r
 //---------------------------------------------------------------------------\r
 void __fastcall TMainFrameDlg::NetworkStreamActionExecute( TObject *Sender )\r
 {\r
-    TNetworkDlg *p_network = p_intfGlobal->p_sys->p_network;\r
+    TNetworkDlg *p_network = p_intf->p_sys->p_network;\r
     if( p_network == NULL )\r
     {\r
-        p_network = new TNetworkDlg( this );\r
-        p_intfGlobal->p_sys->p_network = p_network;\r
+        p_network = new TNetworkDlg( this, p_intf );\r
+        p_intf->p_sys->p_network = p_network;\r
     }\r
     p_network->Show();\r
 }\r
@@ -187,7 +186,7 @@ void __fastcall TMainFrameDlg::FullscreenActionExecute( TObject *Sender )
 {\r
     vout_thread_t *p_vout;\r
 \r
-    p_vout = (vout_thread_t *)vlc_object_find( p_intfGlobal->p_sys->p_input,\r
+    p_vout = (vout_thread_t *)vlc_object_find( p_intf->p_sys->p_input,\r
                                                VLC_OBJECT_VOUT, FIND_CHILD );\r
     if( p_vout == NULL )\r
     {\r
@@ -200,7 +199,7 @@ void __fastcall TMainFrameDlg::FullscreenActionExecute( TObject *Sender )
 //---------------------------------------------------------------------------\r
 void __fastcall TMainFrameDlg::PlaylistActionExecute( TObject *Sender )\r
 {\r
-    TPlaylistDlg *p_playwin = p_intfGlobal->p_sys->p_playwin;\r
+    TPlaylistDlg *p_playwin = p_intf->p_sys->p_playwin;\r
     if( p_playwin->Visible )\r
     {\r
         p_playwin->Hide();\r
@@ -208,7 +207,7 @@ void __fastcall TMainFrameDlg::PlaylistActionExecute( TObject *Sender )
     else\r
     {\r
         playlist_t * p_playlist;\r
-        p_playlist = (playlist_t *)vlc_object_find( p_intfGlobal,\r
+        p_playlist = (playlist_t *)vlc_object_find( p_intf,\r
                                          VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );\r
         if( p_playlist == NULL )\r
         {\r
@@ -223,7 +222,7 @@ void __fastcall TMainFrameDlg::PlaylistActionExecute( TObject *Sender )
 //---------------------------------------------------------------------------\r
 void __fastcall TMainFrameDlg::MessagesActionExecute( TObject *Sender )\r
 {\r
-     p_intfGlobal->p_sys->p_messages->Show();\r
+     p_intf->p_sys->p_messages->Show();\r
 }\r
 //---------------------------------------------------------------------------\r
 void __fastcall TMainFrameDlg::PreferencesActionExecute( TObject *Sender )\r
@@ -233,9 +232,9 @@ void __fastcall TMainFrameDlg::PreferencesActionExecute( TObject *Sender )
 //---------------------------------------------------------------------------\r
 void __fastcall TMainFrameDlg::AboutActionExecute( TObject *Sender )\r
 {\r
-    p_intfGlobal->p_sys->p_about = new TAboutDlg( this );\r
-    p_intfGlobal->p_sys->p_about->ShowModal();\r
-    delete p_intfGlobal->p_sys->p_about;\r
+    TAboutDlg *AboutDlg = new TAboutDlg( this, p_intf );\r
+    AboutDlg->ShowModal();\r
+    delete AboutDlg;\r
 }\r
 //---------------------------------------------------------------------------\r
 void __fastcall TMainFrameDlg::BackActionExecute( TObject *Sender )\r
@@ -270,12 +269,12 @@ void __fastcall TMainFrameDlg::FastActionExecute( TObject *Sender )
 //---------------------------------------------------------------------------\r
 void __fastcall TMainFrameDlg::PreviousActionExecute(TObject *Sender)\r
 {\r
-    p_intfGlobal->p_sys->p_playwin->Previous();\r
+    p_intf->p_sys->p_playwin->Previous();\r
 }\r
 //---------------------------------------------------------------------------\r
 void __fastcall TMainFrameDlg::NextActionExecute(TObject *Sender)\r
 {\r
-    p_intfGlobal->p_sys->p_playwin->Next();\r
+    p_intf->p_sys->p_playwin->Next();\r
 }\r
 //---------------------------------------------------------------------------\r
 void __fastcall TMainFrameDlg::EjectActionExecute( TObject *Sender )\r
@@ -284,7 +283,7 @@ void __fastcall TMainFrameDlg::EjectActionExecute( TObject *Sender )
     char * psz_current;\r
     playlist_t * p_playlist;\r
 \r
-    p_playlist = (playlist_t *)vlc_object_find( p_intfGlobal,\r
+    p_playlist = (playlist_t *)vlc_object_find( p_intf,\r
                                        VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );\r
     if( p_playlist == NULL )\r
     {\r
@@ -321,11 +320,11 @@ void __fastcall TMainFrameDlg::EjectActionExecute( TObject *Sender )
     }\r
 \r
     /* If there's a stream playing, we aren't allowed to eject ! */\r
-    if( p_intfGlobal->p_sys->p_input == NULL )\r
+    if( p_intf->p_sys->p_input == NULL )\r
     {\r
-        msg_Dbg( p_intfGlobal, "ejecting %s", Device.c_str() );\r
+        msg_Dbg( p_intf, "ejecting %s", Device.c_str() );\r
 \r
-        intf_Eject( p_intfGlobal, Device.c_str() );\r
+        intf_Eject( p_intf, Device.c_str() );\r
     }\r
 }\r
 //--------------------------------------------------------------------------\r
@@ -363,11 +362,9 @@ void __fastcall TMainFrameDlg::PopupJumpClick( TObject *Sender )
  ****************************************************************************/\r
 void __fastcall TMainFrameDlg::PrevTitleActionExecute( TObject *Sender )\r
 {\r
-    intf_thread_t * p_intf;\r
     input_area_t  * p_area;\r
     int             i_id;\r
 \r
-    p_intf = p_intfGlobal;\r
     i_id = p_intf->p_sys->p_input->stream.p_selected_area->i_id - 1;\r
 \r
     /* Disallow area 0 since it is used for video_ts.vob */\r
@@ -387,11 +384,9 @@ void __fastcall TMainFrameDlg::PrevTitleActionExecute( TObject *Sender )
 //---------------------------------------------------------------------------\r
 void __fastcall TMainFrameDlg::NextTitleActionExecute( TObject *Sender )\r
 {\r
-    intf_thread_t * p_intf;\r
     input_area_t  * p_area;\r
     int             i_id;\r
 \r
-    p_intf = p_intfGlobal;\r
     i_id = p_intf->p_sys->p_input->stream.p_selected_area->i_id + 1;\r
 \r
     if( i_id < p_intf->p_sys->p_input->stream.i_area_nb )\r
@@ -410,7 +405,6 @@ void __fastcall TMainFrameDlg::NextTitleActionExecute( TObject *Sender )
 //---------------------------------------------------------------------------\r
 void __fastcall TMainFrameDlg::PrevChapterActionExecute( TObject *Sender )\r
 {\r
-    intf_thread_t * p_intf = p_intfGlobal;\r
     input_area_t  * p_area;\r
 \r
     p_area = p_intf->p_sys->p_input->stream.p_selected_area;\r
@@ -431,7 +425,6 @@ void __fastcall TMainFrameDlg::PrevChapterActionExecute( TObject *Sender )
 //---------------------------------------------------------------------------\r
 void __fastcall TMainFrameDlg::NextChapterActionExecute( TObject *Sender )\r
 {\r
-    intf_thread_t * p_intf = p_intfGlobal;\r
     input_area_t  * p_area;\r
 \r
     p_area = p_intf->p_sys->p_input->stream.p_selected_area;\r
@@ -457,7 +450,6 @@ void __fastcall TMainFrameDlg::NextChapterActionExecute( TObject *Sender )
  ****************************************************************************/\r
 void __fastcall TMainFrameDlg::ButtonGoClick( TObject *Sender )\r
 {\r
-    intf_thread_t *p_intf = p_intfGlobal;\r
     int i_channel;\r
 \r
     i_channel = SpinEditChannel->Value;\r
@@ -480,7 +472,6 @@ void __fastcall TMainFrameDlg::ButtonGoClick( TObject *Sender )
  *****************************************************************************/\r
 void __fastcall TMainFrameDlg::ModeManage()\r
 {\r
-    intf_thread_t * p_intf = p_intfGlobal;\r
     TGroupBox     * ActiveGB;\r
     int             i_Height;\r
     bool            b_control;\r

diff --git a/modules/gui/win32/mainframe.h b/modules/gui/win32/mainframe.h
index 48815e8ea9f9fc813612cb5b944cb7aca5087aee..21a77acda4f1d3397e08523dd89fc8bad27a1cc3 100644 (file)
--- a/modules/gui/win32/mainframe.h
+++ b/modules/gui/win32/mainframe.h
@@ -192,9 +192,10 @@ __published:       // IDE-managed Components
     void __fastcall PrevChapterActionExecute( TObject *Sender );\r
     void __fastcall NextChapterActionExecute( TObject *Sender );\r
 private:       // User declarations\r
+    intf_thread_t *p_intf;\r
 public:                // User declarations\r
     TStringList *StringListPref;                   /* stores config dialogs */\r
-    __fastcall TMainFrameDlg( TComponent* Owner );\r
+    __fastcall TMainFrameDlg( TComponent* Owner, intf_thread_t *_p_intf );\r
     virtual __fastcall ~TMainFrameDlg();\r
     void __fastcall DisplayHint( TObject *Sender );\r
     void __fastcall ModeManage();\r

diff --git a/modules/gui/win32/messages.cpp b/modules/gui/win32/messages.cpp
index 761eb80985336d07561b1e146ef0452b47fcd669..e2179493037157793b805878ea77a6fac15f00b8 100644 (file)
--- a/modules/gui/win32/messages.cpp
+++ b/modules/gui/win32/messages.cpp
@@ -34,13 +34,12 @@
 #pragma package(smart_init)\r
 #pragma resource "*.dfm"\r
 \r
-extern intf_thread_t *p_intfGlobal;\r
-\r
 //---------------------------------------------------------------------------\r
-__fastcall TMessagesDlg::TMessagesDlg( TComponent* Owner )\r
-    : TForm( Owner )\r
+__fastcall TMessagesDlg::TMessagesDlg(\r
+    TComponent* Owner, intf_thread_t *_p_intf ) : TForm( Owner )\r
 {\r
-    Icon = p_intfGlobal->p_sys->p_window->Icon;\r
+    p_intf = _p_intf;\r
+    Icon = p_intf->p_sys->p_window->Icon;\r
     Translate( this );\r
 }\r
 //---------------------------------------------------------------------------\r
@@ -51,17 +50,17 @@ void __fastcall TMessagesDlg::ButtonOKClick( TObject *Sender )
 //---------------------------------------------------------------------------\r
 void __fastcall TMessagesDlg::FormHide( TObject *Sender )\r
 {\r
-    p_intfGlobal->p_sys->p_window->MessagesAction->Checked = false;\r
+    p_intf->p_sys->p_window->MessagesAction->Checked = false;\r
 }\r
 //---------------------------------------------------------------------------\r
 void __fastcall TMessagesDlg::FormShow( TObject *Sender )\r
 {\r
-    p_intfGlobal->p_sys->p_window->MessagesAction->Checked = true;\r
+    p_intf->p_sys->p_window->MessagesAction->Checked = true;\r
 }\r
 //---------------------------------------------------------------------------\r
 void __fastcall TMessagesDlg::UpdateLog()\r
 {\r
-    msg_subscription_t *p_sub = p_intfGlobal->p_sys->p_sub;\r
+    msg_subscription_t *p_sub = p_intf->p_sys->p_sub;\r
     int                 i_start, i_stop, i_del, i_count;\r
     int                 i_max_lines;\r
 \r
@@ -91,7 +90,7 @@ void __fastcall TMessagesDlg::UpdateLog()
 \r
             /* Limit log size */\r
             i_count = RichEditMessages->Lines->Count;\r
-            i_max_lines = config_GetInt( p_intfGlobal, "intfwin-max-lines" );\r
+            i_max_lines = config_GetInt( p_intf, "intfwin-max-lines" );\r
             if( i_max_lines > 0 )\r
             {\r
                 for( i_del = 0; i_del <= i_count - i_max_lines; i_del++ )\r

diff --git a/modules/gui/win32/messages.h b/modules/gui/win32/messages.h
index 74bbc9a68b44e9e8b3253aea3faa7d49272abcb0..c37a37e365e0b5720195381221e6e53e4960efbc 100644 (file)
--- a/modules/gui/win32/messages.h
+++ b/modules/gui/win32/messages.h
@@ -39,8 +39,9 @@ __published:  // IDE-managed Components
     void __fastcall FormHide( TObject *Sender );\r
     void __fastcall FormShow( TObject *Sender );\r
 private:       // User declarations\r
+    intf_thread_t *p_intf;\r
 public:                // User declarations\r
-    __fastcall TMessagesDlg( TComponent* Owner );\r
+    __fastcall TMessagesDlg( TComponent* Owner, intf_thread_t *_p_intf );\r
     void __fastcall UpdateLog();\r
 };\r
 //---------------------------------------------------------------------------\r

diff --git a/modules/gui/win32/network.cpp b/modules/gui/win32/network.cpp
index 36356e026dc7d69a14d1c0a309134329a9345d9e..30595edfe53d0eb1cf9b7e341ec322592ab06631 100644 (file)
--- a/modules/gui/win32/network.cpp
+++ b/modules/gui/win32/network.cpp
@@ -37,47 +37,46 @@
 #pragma link "CSPIN"\r
 #pragma resource "*.dfm"\r
 \r
-extern intf_thread_t *p_intfGlobal;\r
-\r
 //---------------------------------------------------------------------------\r
-__fastcall TNetworkDlg::TNetworkDlg( TComponent* Owner )\r
+__fastcall TNetworkDlg::TNetworkDlg( TComponent* Owner, intf_thread_t *_p_intf )\r
         : TForm( Owner )\r
 {\r
-        char *psz_channel_server;\r
+    p_intf = _p_intf;\r
+    char *psz_channel_server;\r
 \r
-        OldRadioValue = 0;\r
+    OldRadioValue = 0;\r
 \r
-        /* server port */\r
-        SpinEditUDPPort->Value = config_GetInt( p_intfGlobal, "server-port" );\r
-        SpinEditMulticastPort->Value = config_GetInt( p_intfGlobal, "server-port" );\r
+    /* server port */\r
+    SpinEditUDPPort->Value = config_GetInt( p_intf, "server-port" );\r
+    SpinEditMulticastPort->Value = config_GetInt( p_intf, "server-port" );\r
 \r
-        /* channel server */\r
-        if( config_GetInt( p_intfGlobal, "network-channel" ) )\r
-        {\r
-            RadioButtonCS->Checked = true;\r
-            RadioButtonCSEnter( RadioButtonCS );\r
-        }\r
+    /* channel server */\r
+    if( config_GetInt( p_intf, "network-channel" ) )\r
+    {\r
+        RadioButtonCS->Checked = true;\r
+        RadioButtonCSEnter( RadioButtonCS );\r
+    }\r
 \r
-        psz_channel_server = config_GetPsz( p_intfGlobal, "channel-server" );\r
-        if( psz_channel_server )\r
-        {\r
-            ComboBoxCSAddress->Text = psz_channel_server;\r
-            free( psz_channel_server );\r
-        }\r
+    psz_channel_server = config_GetPsz( p_intf, "channel-server" );\r
+    if( psz_channel_server )\r
+    {\r
+        ComboBoxCSAddress->Text = psz_channel_server;\r
+        free( psz_channel_server );\r
+    }\r
 \r
-        SpinEditCSPort->Value = config_GetInt( p_intfGlobal, "channel-port" );\r
+    SpinEditCSPort->Value = config_GetInt( p_intf, "channel-port" );\r
 \r
-        Translate( this );\r
+    Translate( this );\r
 }\r
 //---------------------------------------------------------------------------\r
 void __fastcall TNetworkDlg::FormShow( TObject *Sender )\r
 {\r
-    p_intfGlobal->p_sys->p_window->NetworkStreamAction->Checked = true;\r
+    p_intf->p_sys->p_window->NetworkStreamAction->Checked = true;\r
 }\r
 //---------------------------------------------------------------------------\r
 void __fastcall TNetworkDlg::FormHide( TObject *Sender )\r
 {\r
-    p_intfGlobal->p_sys->p_window->NetworkStreamAction->Checked = false;\r
+    p_intf->p_sys->p_window->NetworkStreamAction->Checked = false;\r
 }\r
 //---------------------------------------------------------------------------\r
 void __fastcall TNetworkDlg::BitBtnCancelClick( TObject *Sender )\r
@@ -94,7 +93,7 @@ void __fastcall TNetworkDlg::BitBtnOkClick( TObject *Sender )
     playlist_t *    p_playlist;\r
 \r
     p_playlist = (playlist_t *)\r
-        vlc_object_find( p_intfGlobal, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );\r
+        vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );\r
     if( p_playlist == NULL )\r
     {   \r
         return;\r
@@ -107,7 +106,7 @@ void __fastcall TNetworkDlg::BitBtnOkClick( TObject *Sender )
     {\r
         /* UDP */\r
         case 0:\r
-            config_PutInt( p_intfGlobal, "network-channel", FALSE );\r
+            config_PutInt( p_intf, "network-channel", FALSE );\r
             i_port = SpinEditUDPPort->Value;\r
 \r
             /* Build source name */\r
@@ -117,12 +116,12 @@ void __fastcall TNetworkDlg::BitBtnOkClick( TObject *Sender )
                           PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END );\r
 \r
             /* update the display */\r
-            p_intfGlobal->p_sys->p_playwin->UpdateGrid( p_playlist );\r
+            p_intf->p_sys->p_playwin->UpdateGrid( p_playlist );\r
             break;\r
 \r
         /* UDP Multicast */\r
         case 1:\r
-            config_PutInt( p_intfGlobal, "network-channel", FALSE );\r
+            config_PutInt( p_intf, "network-channel", FALSE );\r
             Address = ComboBoxMulticastAddress->Text;\r
             i_port = SpinEditMulticastPort->Value;\r
 \r
@@ -133,26 +132,26 @@ void __fastcall TNetworkDlg::BitBtnOkClick( TObject *Sender )
                           PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END );\r
 \r
             /* update the display */\r
-            p_intfGlobal->p_sys->p_playwin->UpdateGrid( p_playlist );\r
+            p_intf->p_sys->p_playwin->UpdateGrid( p_playlist );\r
             break;\r
 \r
         /* Channel server */\r
         case 2:\r
-            config_PutInt( p_intfGlobal, "network-channel", TRUE );\r
-            config_PutPsz( p_intfGlobal, "channel-server", Channel.c_str() );\r
-            config_PutInt( p_intfGlobal, "channel-port", i_channel_port );\r
+            config_PutInt( p_intf, "network-channel", TRUE );\r
+            config_PutPsz( p_intf, "channel-server", Channel.c_str() );\r
+            config_PutInt( p_intf, "channel-port", i_channel_port );\r
 \r
-            if( p_intfGlobal->p_vlc->p_channel == NULL )\r
+            if( p_intf->p_vlc->p_channel == NULL )\r
             {\r
-                network_ChannelCreate( p_intfGlobal );\r
+                network_ChannelCreate( p_intf );\r
             }\r
 \r
-            p_intfGlobal->p_sys->b_playing = 1;\r
+            p_intf->p_sys->b_playing = 1;\r
             break;\r
 \r
         /* HTTP */\r
         case 3:\r
-            config_PutInt( p_intfGlobal, "network-channel", FALSE );\r
+            config_PutInt( p_intf, "network-channel", FALSE );\r
             Address = EditHTTPURL->Text;\r
 \r
             /* Build source name with a basic test */\r
@@ -169,7 +168,7 @@ void __fastcall TNetworkDlg::BitBtnOkClick( TObject *Sender )
                           PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END );\r
 \r
             /* update the display */\r
-            p_intfGlobal->p_sys->p_playwin->UpdateGrid( p_playlist );\r
+            p_intf->p_sys->p_playwin->UpdateGrid( p_playlist );\r
             break;\r
     }\r
 \r

diff --git a/modules/gui/win32/network.h b/modules/gui/win32/network.h
index 45c50572b4aa32921a25bc5f091134331e8e625f..0f28871c5192c8c622702552589b52ef7c920463 100644 (file)
--- a/modules/gui/win32/network.h
+++ b/modules/gui/win32/network.h
@@ -68,8 +68,9 @@ __published:  // IDE-managed Components
 private:       // User declarations\r
     int OldRadioValue;\r
     void __fastcall ChangeEnabled( int i_selected );\r
+    intf_thread_t *p_intf;\r
 public:                // User declarations\r
-    __fastcall TNetworkDlg( TComponent* Owner );\r
+    __fastcall TNetworkDlg( TComponent* Owner, intf_thread_t *_p_intf );\r
 };\r
 //---------------------------------------------------------------------------\r
 #endif\r

diff --git a/modules/gui/win32/playlist.cpp b/modules/gui/win32/playlist.cpp
index 09f81fed47c9c6d3f2bff1b89d2c55249050773e..42320ced51d355bc341da118cd96975910f97f9a 100644 (file)
--- a/modules/gui/win32/playlist.cpp
+++ b/modules/gui/win32/playlist.cpp
@@ -34,13 +34,12 @@
 //#pragma package(smart_init)\r
 #pragma resource "*.dfm"\r
 \r
-extern intf_thread_t *p_intfGlobal;\r
-\r
 //---------------------------------------------------------------------------\r
-__fastcall TPlaylistDlg::TPlaylistDlg( TComponent* Owner )\r
-        : TForm( Owner )\r
+__fastcall TPlaylistDlg::TPlaylistDlg(\r
+    TComponent* Owner, intf_thread_t *_p_intf ) : TForm( Owner )\r
 {\r
-    Icon = p_intfGlobal->p_sys->p_window->Icon;\r
+    p_intf = _p_intf;\r
+    Icon = p_intf->p_sys->p_window->Icon;\r
     Translate( this );\r
 }\r
 //---------------------------------------------------------------------------\r
@@ -70,12 +69,12 @@ char * __fastcall TPlaylistDlg::rindex( char *s, char c )
  ****************************************************************************/\r
 void __fastcall TPlaylistDlg::FormShow( TObject *Sender )\r
 {\r
-    p_intfGlobal->p_sys->p_window->PlaylistAction->Checked = true;\r
+    p_intf->p_sys->p_window->PlaylistAction->Checked = true;\r
 }\r
 //---------------------------------------------------------------------------\r
 void __fastcall TPlaylistDlg::FormHide( TObject *Sender )\r
 {\r
-    p_intfGlobal->p_sys->p_window->PlaylistAction->Checked = false;\r
+    p_intf->p_sys->p_window->PlaylistAction->Checked = false;\r
 }\r
 //---------------------------------------------------------------------------\r
 void __fastcall TPlaylistDlg::BitBtnOkClick( TObject *Sender )\r
@@ -90,7 +89,7 @@ void __fastcall TPlaylistDlg::PlayStreamActionExecute( TObject *Sender )
     TItemStates Focused;\r
 \r
     playlist_t * p_playlist = (playlist_t *)\r
-        vlc_object_find( p_intfGlobal, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );\r
+        vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );\r
     if( p_playlist == NULL )\r
     {\r
         return;\r
@@ -140,7 +139,7 @@ void __fastcall TPlaylistDlg::ListViewPlaylistCustomDrawItem(
     TRect Rect = Item->DisplayRect( drBounds );\r
 \r
     /* set the background color */\r
-    if( Item->Index == p_intfGlobal->p_sys->i_playing )\r
+    if( Item->Index == p_intf->p_sys->i_playing )\r
     {\r
         Sender->Canvas->Brush->Color = clRed;\r
     }\r
@@ -159,17 +158,17 @@ void __fastcall TPlaylistDlg::ListViewPlaylistCustomDrawItem(
  ****************************************************************************/\r
 void __fastcall TPlaylistDlg::MenuAddFileClick( TObject *Sender )\r
 {\r
-    p_intfGlobal->p_sys->p_window->OpenFileActionExecute( Sender );\r
+    p_intf->p_sys->p_window->OpenFileActionExecute( Sender );\r
 }\r
 //---------------------------------------------------------------------------\r
 void __fastcall TPlaylistDlg::MenuAddDiscClick( TObject *Sender )\r
 {\r
-    p_intfGlobal->p_sys->p_window->OpenDiscActionExecute( Sender );\r
+    p_intf->p_sys->p_window->OpenDiscActionExecute( Sender );\r
 }\r
 //---------------------------------------------------------------------------\r
 void __fastcall TPlaylistDlg::MenuAddNetClick( TObject *Sender )\r
 {\r
-    p_intfGlobal->p_sys->p_window->NetworkStreamActionExecute( Sender );\r
+    p_intf->p_sys->p_window->NetworkStreamActionExecute( Sender );\r
 }\r
 //---------------------------------------------------------------------------\r
 void __fastcall TPlaylistDlg::MenuAddUrlClick( TObject *Sender )\r
@@ -182,10 +181,10 @@ void __fastcall TPlaylistDlg::DeleteSelectionActionExecute( TObject *Sender )
 #if 0 /* PLAYLIST TARASS */\r
     /* user wants to delete a file in the queue */\r
     int         i_pos;\r
-    playlist_t *p_playlist = p_intfGlobal->p_vlc->p_playlist;\r
+    playlist_t *p_playlist = p_intf->p_vlc->p_playlist;\r
 \r
     /* lock the struct */\r
-    vlc_mutex_lock( &p_intfGlobal->change_lock );\r
+    vlc_mutex_lock( &p_intf->change_lock );\r
 \r
     /* delete the items from the last to the first */\r
     for( i_pos = p_playlist->i_size - 1; i_pos >= 0; i_pos-- )\r
@@ -199,7 +198,7 @@ void __fastcall TPlaylistDlg::DeleteSelectionActionExecute( TObject *Sender )
     /* Rebuild the ListView */\r
     UpdateGrid( p_playlist );\r
 \r
-    vlc_mutex_unlock( &p_intfGlobal->change_lock );\r
+    vlc_mutex_unlock( &p_intf->change_lock );\r
 #endif\r
 }\r
 //---------------------------------------------------------------------------\r
@@ -207,10 +206,10 @@ void __fastcall TPlaylistDlg::DeleteAllActionExecute( TObject *Sender )
 {\r
 #if 0 /* PLAYLIST TARASS */\r
     int         i_pos;\r
-    playlist_t *p_playlist = p_intfGlobal->p_vlc->p_playlist;\r
+    playlist_t *p_playlist = p_intf->p_vlc->p_playlist;\r
 \r
     /* lock the struct */\r
-    vlc_mutex_lock( &p_intfGlobal->change_lock );\r
+    vlc_mutex_lock( &p_intf->change_lock );\r
 \r
     /* delete the items from the last to the first */\r
     for( i_pos = p_playlist->i_size - 1; i_pos >= 0; i_pos-- )\r
@@ -221,7 +220,7 @@ void __fastcall TPlaylistDlg::DeleteAllActionExecute( TObject *Sender )
     /* Rebuild the ListView */\r
     UpdateGrid( p_playlist );\r
 \r
-    vlc_mutex_unlock( &p_intfGlobal->change_lock );\r
+    vlc_mutex_unlock( &p_intf->change_lock );\r
 #endif\r
 }\r
 //---------------------------------------------------------------------------\r
@@ -230,7 +229,7 @@ void __fastcall TPlaylistDlg::InvertSelectionActionExecute( TObject *Sender )
 #if 0 /* PLAYLIST TARASS */\r
 #define NOT( var ) ( (var) ? false : true )\r
     int         i_pos;\r
-    playlist_t *p_playlist = p_intfGlobal->p_vlc->p_playlist;\r
+    playlist_t *p_playlist = p_intf->p_vlc->p_playlist;\r
     TListItems *Items = ListViewPlaylist->Items;\r
 \r
     /* delete the items from the last to the first */\r
@@ -293,10 +292,10 @@ void __fastcall TPlaylistDlg::UpdateGrid( playlist_t * p_playlist )
     ListViewPlaylist->Items->EndUpdate();\r
 }\r
 //---------------------------------------------------------------------------\r
-void __fastcall TPlaylistDlg::Manage( intf_thread_t * p_intf )\r
+void __fastcall TPlaylistDlg::Manage()\r
 {\r
     playlist_t * p_playlist = (playlist_t *)\r
-        vlc_object_find( p_intfGlobal, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );\r
+        vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );\r
     if( p_playlist == NULL )\r
     {\r
         return;\r
@@ -319,37 +318,40 @@ void __fastcall TPlaylistDlg::Manage( intf_thread_t * p_intf )
 void __fastcall TPlaylistDlg::DeleteItem( int i_pos )\r
 {\r
     playlist_t * p_playlist = (playlist_t *)\r
-        vlc_object_find( p_intfGlobal, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );\r
+        vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );\r
     if( p_playlist == NULL )\r
     {\r
         return;\r
     }\r
 \r
     playlist_Delete( p_playlist, i_pos );\r
+    vlc_object_release( p_playlist );\r
 }\r
 //---------------------------------------------------------------------------\r
 void __fastcall TPlaylistDlg::Previous()\r
 {\r
     playlist_t * p_playlist = (playlist_t *)\r
-        vlc_object_find( p_intfGlobal, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );\r
+        vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );\r
     if( p_playlist == NULL )\r
     {\r
         return;\r
     }\r
 \r
     playlist_Prev( p_playlist );\r
+    vlc_object_release( p_playlist );\r
 }\r
 //---------------------------------------------------------------------------\r
 void __fastcall TPlaylistDlg::Next()\r
 {\r
     playlist_t * p_playlist = (playlist_t *)\r
-        vlc_object_find( p_intfGlobal, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );\r
+        vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );\r
     if( p_playlist == NULL )\r
     {\r
         return;\r
     }\r
 \r
     playlist_Next( p_playlist );\r
+    vlc_object_release( p_playlist );\r
 }\r
 //---------------------------------------------------------------------------\r
 \r

diff --git a/modules/gui/win32/playlist.h b/modules/gui/win32/playlist.h
index d9133bea7391ec5bd6e4760c2778fd0bc54d6801..8e6cd1b36679db78dd03bc8d625733f62e3ba2b6 100644 (file)
--- a/modules/gui/win32/playlist.h
+++ b/modules/gui/win32/playlist.h
@@ -83,10 +83,11 @@ __published:        // IDE-managed Components
     void __fastcall PlayStreamActionExecute( TObject *Sender );\r
 private:       // User declarations\r
     char * __fastcall rindex( char *s, char c );\r
+    intf_thread_t *p_intf;\r
 public:                // User declarations\r
-    __fastcall TPlaylistDlg( TComponent* Owner );\r
+    __fastcall TPlaylistDlg( TComponent* Owner, intf_thread_t *_p_intf );\r
     void __fastcall UpdateGrid( playlist_t * p_playlist );\r
-    void __fastcall Manage( intf_thread_t * p_intf );\r
+    void __fastcall Manage();\r
     void __fastcall DeleteItem( int i_pos );\r
     void __fastcall Previous();\r
     void __fastcall Next();\r

diff --git a/modules/gui/win32/win32.cpp b/modules/gui/win32/win32.cpp
index 56ed13dea625157ee0ab81cb8a62353c1b87dbd0..e4a3bb41534e9f8586f323be996511c78a789871 100644 (file)
--- a/modules/gui/win32/win32.cpp
+++ b/modules/gui/win32/win32.cpp
@@ -106,9 +106,9 @@ static void Close ( vlc_object_t *p_this )
  *****************************************************************************/
 static void Run( intf_thread_t *p_intf )
 {
-    p_intf->p_sys->p_window = new TMainFrameDlg( NULL );
-    p_intf->p_sys->p_playwin = new TPlaylistDlg( NULL );
-    p_intf->p_sys->p_messages = new TMessagesDlg( NULL );
+    p_intf->p_sys->p_window = new TMainFrameDlg( NULL, p_intf );
+    p_intf->p_sys->p_playwin = new TPlaylistDlg( NULL, p_intf );
+    p_intf->p_sys->p_messages = new TMessagesDlg( NULL, p_intf );
 
     /* show main window and wait until it is closed */
     p_intf->p_sys->p_window->ShowModal();
@@ -145,7 +145,7 @@ int Win32Manage( intf_thread_t *p_intf )
     p_intf->p_sys->p_messages->UpdateLog();
 
     /* Update the playlist */
-    p_intf->p_sys->p_playwin->Manage( p_intf );
+    p_intf->p_sys->p_playwin->Manage();
 
     /* Update the input */
     if( p_intf->p_sys->p_input == NULL )

diff --git a/modules/gui/win32/win32_common.h b/modules/gui/win32/win32_common.h
index e71fabd797585595ca4b8498788cf530edd214f2..5a07434d10a3e4a8de13d5e421d0c424dc7f70b9 100644 (file)
--- a/modules/gui/win32/win32_common.h
+++ b/modules/gui/win32/win32_common.h
@@ -59,7 +59,6 @@ struct intf_sys_t
     TMainFrameDlg     * p_window;                             /* main window */\r
     TPlaylistDlg      * p_playwin;                               /* playlist */\r
     TPopupMenu        * p_popup;                               /* popup menu */\r
-    TAboutDlg         * p_about;                             /* about window */\r
     TDiscDlg          * p_disc;                     /* disc selection window */\r
     TNetworkDlg       * p_network;                  /* network stream window */\r
     TPreferencesDlg   * p_preferences;                 /* preferences window */\r