- * : start playing only when opening a stream from the main window;

  when opening it from the playlist window, add it to the list, but
  don't change anything to the playing state and current stream.

- playlist.dfm : proper resizing behaviour

diff --git a/modules/gui/win32/disc.cpp b/modules/gui/win32/disc.cpp
index e8162d0d4ae3865ec871d624c35a8c6d3c0d66de..bb174a20a71339a907e1a5858ec1666c578a7f6b 100644 (file)
--- a/modules/gui/win32/disc.cpp
+++ b/modules/gui/win32/disc.cpp
@@ -81,8 +81,9 @@ void __fastcall TDiscDlg::BitBtnOkClick( TObject *Sender )
     /* Build source name and add it to playlist */\r
     Source = Method + ":" + Device + "@" + Title + "," + Chapter;\r
 \r
-    p_intf->p_sys->p_playwin->Add( Source, PLAYLIST_APPEND | PLAYLIST_GO,\r
-                                   PLAYLIST_END );\r
+    p_intf->p_sys->p_playwin->Add( Source, PLAYLIST_APPEND\r
+            | ( p_intf->p_sys->b_play_when_adding ? PLAYLIST_GO : 0 ),\r
+            PLAYLIST_END );\r
 }\r
 //---------------------------------------------------------------------------\r
 void __fastcall TDiscDlg::RadioGroupTypeClick( TObject *Sender )\r

diff --git a/modules/gui/win32/mainframe.cpp b/modules/gui/win32/mainframe.cpp
index add53a7dc23fe16e7c0006beb246e0d5400e89d3..a9afecc1bf1be924890a3a71045d0ef2c1b48e3e 100644 (file)
--- a/modules/gui/win32/mainframe.cpp
+++ b/modules/gui/win32/mainframe.cpp
@@ -149,8 +149,9 @@ void __fastcall TMainFrameDlg::OpenFileActionExecute( TObject *Sender )
         /* add the new file to the interface playlist */\r
         for ( int i = 0 ; i < OpenDialog1->Files->Count ; i++ )\r
             p_intf->p_sys->p_playwin->Add( OpenDialog1->Files->Strings[i],\r
-                                        PLAYLIST_APPEND,\r
-                                        PLAYLIST_END );\r
+                    PLAYLIST_APPEND\r
+                    | ( p_intf->p_sys->b_play_when_adding ? PLAYLIST_GO : 0 ),\r
+                    PLAYLIST_END );\r
     };\r
 }\r
 //---------------------------------------------------------------------------\r

diff --git a/modules/gui/win32/network.cpp b/modules/gui/win32/network.cpp
index 91f385e1960b12ae9bb43e4057372c5b03ea7da0..a46b86d09b013c69d3d6b9c0e618e80d6a2858e7 100644 (file)
--- a/modules/gui/win32/network.cpp
+++ b/modules/gui/win32/network.cpp
@@ -105,8 +105,9 @@ void __fastcall TNetworkDlg::BitBtnOkClick( TObject *Sender )
             Source = "udp:@:" + IntToStr( i_port );\r
 \r
             p_intf->p_sys->p_playwin->Add( Source,\r
-                                           PLAYLIST_APPEND | PLAYLIST_GO,\r
-                                           PLAYLIST_END );\r
+                    PLAYLIST_APPEND\r
+                    | ( p_intf->p_sys->b_play_when_adding ? PLAYLIST_GO : 0 )\r
+                    , PLAYLIST_END );\r
             break;\r
 \r
         /* UDP Multicast */\r
@@ -119,8 +120,9 @@ void __fastcall TNetworkDlg::BitBtnOkClick( TObject *Sender )
             Source = "udp:@" + Address + ":" + IntToStr( i_port );\r
 \r
             p_intf->p_sys->p_playwin->Add( Source,\r
-                                           PLAYLIST_APPEND | PLAYLIST_GO,\r
-                                           PLAYLIST_END );\r
+                    PLAYLIST_APPEND\r
+                    | ( p_intf->p_sys->b_play_when_adding ? PLAYLIST_GO : 0 )\r
+                    , PLAYLIST_END );\r
 \r
         /* Channel server */\r
         case 2:\r
@@ -152,8 +154,9 @@ void __fastcall TNetworkDlg::BitBtnOkClick( TObject *Sender )
             }\r
 \r
             p_intf->p_sys->p_playwin->Add( Source,\r
-                                           PLAYLIST_APPEND | PLAYLIST_GO,\r
-                                           PLAYLIST_END );\r
+                    PLAYLIST_APPEND\r
+                    | ( p_intf->p_sys->b_play_when_adding ? PLAYLIST_GO : 0 )\r
+                    , PLAYLIST_END );\r
 \r
             break;\r
     }\r

diff --git a/modules/gui/win32/playlist.cpp b/modules/gui/win32/playlist.cpp
index f659f06c0ffe9d2cf5809540b3bac0baedf2808f..204df11af63565ea1a8b332e0416a9c91099fbff 100644 (file)
--- a/modules/gui/win32/playlist.cpp
+++ b/modules/gui/win32/playlist.cpp
@@ -189,17 +189,23 @@ void __fastcall TPlaylistDlg::ListViewPlaylistCustomDrawItem(
  ****************************************************************************/\r
 void __fastcall TPlaylistDlg::MenuAddFileClick( TObject *Sender )\r
 {\r
+    p_intf->p_sys->b_play_when_adding = false;\r
     p_intf->p_sys->p_window->OpenFileActionExecute( Sender );\r
+    p_intf->p_sys->b_play_when_adding = true;\r
 }\r
 //---------------------------------------------------------------------------\r
 void __fastcall TPlaylistDlg::MenuAddDiscClick( TObject *Sender )\r
 {\r
+    p_intf->p_sys->b_play_when_adding = false;\r
     p_intf->p_sys->p_window->OpenDiscActionExecute( Sender );\r
+    p_intf->p_sys->b_play_when_adding = true;\r
 }\r
 //---------------------------------------------------------------------------\r
 void __fastcall TPlaylistDlg::MenuAddNetClick( TObject *Sender )\r
 {\r
+    p_intf->p_sys->b_play_when_adding = false;\r
     p_intf->p_sys->p_window->NetworkStreamActionExecute( Sender );\r
+    p_intf->p_sys->b_play_when_adding = true;\r
 }\r
 //---------------------------------------------------------------------------\r
 void __fastcall TPlaylistDlg::MenuAddUrlClick( TObject *Sender )\r

diff --git a/modules/gui/win32/playlist.dfm b/modules/gui/win32/playlist.dfm
index a9afc6fe8490aa08f68ecd23e038208e59d3f62e..0a13c11f3baa67743c6f4e33f1e4481b3854b0ae 100644 (file)
--- a/modules/gui/win32/playlist.dfm
+++ b/modules/gui/win32/playlist.dfm
@@ -34,7 +34,7 @@ object PlaylistDlg: TPlaylistDlg
     Top = 10\r
     Width = 305\r
     Height = 331\r
-    Anchors = [akTop, akBottom]\r
+    Anchors = [akLeft, akTop, akRight, akBottom]\r
     Columns = <\r
       item\r
         Caption = 'Filename'\r

diff --git a/modules/gui/win32/win32.cpp b/modules/gui/win32/win32.cpp
index 9350d7a3f72b93c57170c5024e761e99505db6b4..ae7d9caadc3882f6584f02364815b3bfec050aa0 100644 (file)
--- a/modules/gui/win32/win32.cpp
+++ b/modules/gui/win32/win32.cpp
@@ -2,7 +2,7 @@
  * win32.cpp : Win32 interface plugin for vlc
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: win32.cpp,v 1.5 2002/12/13 03:52:58 videolan Exp $
+ * $Id: win32.cpp,v 1.6 2002/12/13 17:05:12 babal Exp $
  *
  * Authors: Olivier Teulière <ipkiss@via.ecp.fr>
  *
@@ -76,6 +76,7 @@ static int Open ( vlc_object_t *p_this )
 
     p_intf->p_sys->p_input = NULL;
     p_intf->p_sys->i_playing = -1;
+    p_intf->p_sys->b_play_when_adding = true;
     p_intf->p_sys->b_slider_free = 1;
 
     return( 0 );

diff --git a/modules/gui/win32/win32_common.h b/modules/gui/win32/win32_common.h
index 01a10fb043a21ec4ac6f83a5f0c4c356f03fc4a5..04f35e761ec34dba56631c7319f906195701f2bd 100644 (file)
--- a/modules/gui/win32/win32_common.h
+++ b/modules/gui/win32/win32_common.h
@@ -73,6 +73,7 @@ struct intf_sys_t
 \r
     /* Playlist management */\r
     int                 i_playing;                 /* playlist selected item */\r
+    vlc_bool_t          b_play_when_adding;\r
 \r
     /* The window labels for DVD mode */\r
     TLabel            * p_label_title;\r