* src/playlist/playlist.c : playing again a playlist already in a

   playing state resets the input speed to normal to make sure the
   stream isn't paused or slowed or played faster anymore.
   By doing that, fixes the following bug of the Windows interface:
   when pushing the play button on a paused or slowed stream, nothing
   used to happen.
 * modules/gui/win32/playlist.cpp : when pushing the play button and the
   playlist is empty, displaying the playlist window
 * win32.cpp : rephrasing the module description to "Native Windows
   interface module"

diff --git a/modules/gui/win32/playlist.cpp b/modules/gui/win32/playlist.cpp
index 053ef283ec10004d138c8c7f88269b06a993ca0d..4508156194bd109469d4bbe993eb6542deb40088 100644 (file)
--- a/modules/gui/win32/playlist.cpp
+++ b/modules/gui/win32/playlist.cpp
@@ -298,7 +298,10 @@ void __fastcall TPlaylistDlg::Play()
     if( p_playlist == NULL )\r
         return;\r
 \r
-    playlist_Play( p_playlist );\r
+    if ( p_playlist->i_size )\r
+        playlist_Play( p_playlist );\r
+    else\r
+        Show();\r
 }\r
 //---------------------------------------------------------------------------\r
 void __fastcall TPlaylistDlg::Pause()\r

diff --git a/modules/gui/win32/win32.cpp b/modules/gui/win32/win32.cpp
index e4a3bb41534e9f8586f323be996511c78a789871..fdf527e0bb1635c9cf31ea4919c80afc37910dbb 100644 (file)
--- a/modules/gui/win32/win32.cpp
+++ b/modules/gui/win32/win32.cpp
@@ -257,10 +257,9 @@ int Win32Manage( intf_thread_t *p_intf )
 vlc_module_begin();
     add_category_hint( N_("Miscellaneous"), NULL );
     add_integer( "intfwin-max-lines", 500, NULL, MAX_LINES_TEXT, MAX_LINES_LONGTEXT );
-    set_description( _("Win32 interface module") );
+    set_description( _("Native Windows interface module") );
     set_capability( "interface", 100 );
     set_callbacks( E_(Open), E_(Close) );
     add_shortcut( "win" );
     add_shortcut( "win32" );
 vlc_module_end();
-

diff --git a/src/playlist/playlist.c b/src/playlist/playlist.c
index 655dc5de47247d45e0d9cba078f8404aeecdc7d4..42b7ef3e950d929da96ad1c26b06c0192d6a9a51 100644 (file)
--- a/src/playlist/playlist.c
+++ b/src/playlist/playlist.c
@@ -2,7 +2,7 @@
  * playlist.c : Playlist management functions
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: playlist.c,v 1.25 2002/12/03 23:36:41 gitan Exp $
+ * $Id: playlist.c,v 1.26 2002/12/06 06:42:24 babal Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -284,6 +284,10 @@ void playlist_Command( playlist_t * p_playlist, int i_command, int i_arg )
 
     case PLAYLIST_PLAY:
         p_playlist->i_status = PLAYLIST_RUNNING;
+       if ( p_playlist->p_input )
+       {
+            input_SetStatus( p_playlist->p_input, INPUT_STATUS_PLAY );
+       }
         break;
 
     case PLAYLIST_SKIP: