* ALL: the first libvlc commit.

[vlc] / plugins / win32 / playlist.cpp

diff --git a/plugins/win32/playlist.cpp b/plugins/win32/playlist.cpp
index aa90ac75b91db1f5634e113c0da2eee882174656..3d9fa6dd7fe96e65eea72ef44c1e7210c1d16957 100644 (file)
--- a/plugins/win32/playlist.cpp
+++ b/plugins/win32/playlist.cpp
@@ -23,13 +23,8 @@
 #include <vcl.h>\r
 #pragma hdrstop\r
 \r
-#include <videolan/vlc.h>\r
-\r
-#include "stream_control.h"\r
-#include "input_ext-intf.h"\r
-\r
-#include "interface.h"\r
-#include "intf_playlist.h"\r
+#include <vlc/vlc.h>\r
+#include <vlc/intf.h>\r
 \r
 #include "playlist.h"\r
 #include "win32_common.h"\r
@@ -38,7 +33,7 @@
 //#pragma package(smart_init)\r
 #pragma resource "*.dfm"\r
 \r
-extern  struct intf_thread_s *p_intfGlobal;\r
+extern intf_thread_t *p_intfGlobal;\r
 \r
 //---------------------------------------------------------------------------\r
 __fastcall TPlaylistDlg::TPlaylistDlg( TComponent* Owner )\r
@@ -112,13 +107,13 @@ void __fastcall TPlaylistDlg::ListViewPlaylistDblClick( TObject *Sender )
         }\r
 \r
         /* stop current item, select the good one */\r
-        if( ( p_input_bank->pp_input[0] != NULL ) &&\r
+        if( ( p_intfGlobal->p_vlc->p_input_bank->pp_input[0] != NULL ) &&\r
             ( Item->Index != p_intfGlobal->p_sys->i_playing ) )\r
         {\r
             /* FIXME: temporary hack */\r
-            p_input_bank->pp_input[0]->b_eof = 1;\r
+            p_intfGlobal->p_vlc->p_input_bank->pp_input[0]->b_eof = 1;\r
         }\r
-        intf_PlaylistJumpto( p_main->p_playlist, Item->Index - 1 );\r
+        intf_PlaylistJumpto( p_intfGlobal->p_vlc->p_playlist, Item->Index - 1 );\r
     }\r
 }\r
 //---------------------------------------------------------------------------\r
@@ -186,7 +181,7 @@ void __fastcall TPlaylistDlg::MenuDeleteSelectedClick( TObject *Sender )
 {\r
     /* user wants to delete a file in the queue */\r
     int         i_pos;\r
-    playlist_t *p_playlist = p_main->p_playlist;\r
+    playlist_t *p_playlist = p_intfGlobal->p_vlc->p_playlist;\r
 \r
     /* lock the struct */\r
     vlc_mutex_lock( &p_intfGlobal->change_lock );\r
@@ -209,7 +204,7 @@ void __fastcall TPlaylistDlg::MenuDeleteSelectedClick( TObject *Sender )
 void __fastcall TPlaylistDlg::MenuDeleteAllClick( TObject *Sender )\r
 {\r
     int         i_pos;\r
-    playlist_t *p_playlist = p_main->p_playlist;\r
+    playlist_t *p_playlist = p_intfGlobal->p_vlc->p_playlist;\r
 \r
     /* lock the struct */\r
     vlc_mutex_lock( &p_intfGlobal->change_lock );\r
@@ -230,7 +225,7 @@ void __fastcall TPlaylistDlg::MenuSelectionInvertClick( TObject *Sender )
 {\r
 #define NOT( var ) ( (var) ? false : true )\r
     int         i_pos;\r
-    playlist_t *p_playlist = p_main->p_playlist;\r
+    playlist_t *p_playlist = p_intfGlobal->p_vlc->p_playlist;\r
     TListItems *Items = ListViewPlaylist->Items;\r
 \r
     /* delete the items from the last to the first */\r
@@ -324,7 +319,7 @@ void __fastcall TPlaylistDlg::UpdateGrid( playlist_t * p_playlist )
 //---------------------------------------------------------------------------\r
 void __fastcall TPlaylistDlg::Manage( intf_thread_t * p_intf )\r
 {\r
-    playlist_t *p_playlist = p_main->p_playlist ;\r
+    playlist_t *p_playlist = p_intfGlobal->p_vlc->p_playlist ;\r
 \r
     vlc_mutex_lock( &p_playlist->change_lock );\r
 \r
@@ -341,41 +336,41 @@ void __fastcall TPlaylistDlg::Manage( intf_thread_t * p_intf )
 //---------------------------------------------------------------------------\r
 void __fastcall TPlaylistDlg::DeleteItem( int i_pos )\r
 {\r
-    intf_PlaylistDelete( p_main->p_playlist, i_pos );\r
+    intf_PlaylistDelete( p_intfGlobal->p_vlc->p_playlist, i_pos );\r
 \r
     /* are we deleting the current played stream */\r
     if( p_intfGlobal->p_sys->i_playing == i_pos )\r
     {\r
         /* next ! */\r
-        p_input_bank->pp_input[0]->b_eof = 1;\r
+        p_intfGlobal->p_vlc->p_input_bank->pp_input[0]->b_eof = 1;\r
         /* this has to set the slider to 0 */\r
         \r
         /* step minus one */\r
         p_intfGlobal->p_sys->i_playing-- ;\r
 \r
-        vlc_mutex_lock( &p_main->p_playlist->change_lock );\r
-        p_main->p_playlist->i_index-- ;\r
-        vlc_mutex_unlock( &p_main->p_playlist->change_lock );\r
+        vlc_mutex_lock( &p_intfGlobal->p_vlc->p_playlist->change_lock );\r
+        p_intfGlobal->p_vlc->p_playlist->i_index-- ;\r
+        vlc_mutex_unlock( &p_intfGlobal->p_vlc->p_playlist->change_lock );\r
     }\r
 }\r
 //---------------------------------------------------------------------------\r
 void __fastcall TPlaylistDlg::Previous()\r
 {\r
-    if( p_input_bank->pp_input[0] != NULL )\r
+    if( p_intfGlobal->p_vlc->p_input_bank->pp_input[0] != NULL )\r
     {\r
         /* FIXME: temporary hack */\r
-        intf_PlaylistPrev( p_main->p_playlist );\r
-        intf_PlaylistPrev( p_main->p_playlist );\r
-        p_input_bank->pp_input[0]->b_eof = 1;\r
+        intf_PlaylistPrev( p_intfGlobal->p_vlc->p_playlist );\r
+        intf_PlaylistPrev( p_intfGlobal->p_vlc->p_playlist );\r
+        p_intfGlobal->p_vlc->p_input_bank->pp_input[0]->b_eof = 1;\r
     }\r
 }\r
 //---------------------------------------------------------------------------\r
 void __fastcall TPlaylistDlg::Next()\r
 {\r
-    if( p_input_bank->pp_input[0] != NULL )\r
+    if( p_intfGlobal->p_vlc->p_input_bank->pp_input[0] != NULL )\r
     {\r
         /* FIXME: temporary hack */\r
-        p_input_bank->pp_input[0]->b_eof = 1;\r
+        p_intfGlobal->p_vlc->p_input_bank->pp_input[0]->b_eof = 1;\r
     }\r
 }\r
 //---------------------------------------------------------------------------\r