Commit 426a6dc5 authored by Boris Dorès's avatar Boris Dorès

* 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"
parent 40dfc834
......@@ -298,7 +298,10 @@ void __fastcall TPlaylistDlg::Play()
if( p_playlist == NULL )
return;
playlist_Play( p_playlist );
if ( p_playlist->i_size )
playlist_Play( p_playlist );
else
Show();
}
//---------------------------------------------------------------------------
void __fastcall TPlaylistDlg::Pause()
......
......@@ -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();
......@@ -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:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment