mirrors/vlc
0
0
Fork 0
mirror of https://github.com/videolan/vlc.git synced 2024-11-27 11:57:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Qt4: ensure to give a valid URI to the playlist

Browse Source 
The URI is only given to the core while the original mrl is kept for the
display.

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
This commit is contained in:
Ludovic Fauvet 2011-10-13 14:33:30 +02:00 committed by Jean-Baptiste Kempf
parent ca60719c73
commit f53bb2ebf5
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
modules/gui/qt4/dialogs_provider.cpp
View File

@ -474,12 +474,17 @@ void DialogsProvider::openUrlDialog()
QString url = oud->url();
if( !url.isEmpty() )
{
playlist_Add( THEPL, qtu( url ),
NULL, !oud->shouldEnqueue() ?
( PLAYLIST_APPEND | PLAYLIST_GO )
: ( PLAYLIST_APPEND | PLAYLIST_PREPARSE ),
PLAYLIST_END, true, false );
RecentsMRL::getInstance( p_intf )->addRecent( url );
char *uri = make_URI( qtu( url ), NULL );
if( likely( uri != NULL ) )
{
playlist_Add( THEPL, uri,
NULL, !oud->shouldEnqueue() ?
( PLAYLIST_APPEND | PLAYLIST_GO )
: ( PLAYLIST_APPEND | PLAYLIST_PREPARSE ),
PLAYLIST_END, true, false );
RecentsMRL::getInstance( p_intf )->addRecent( url );
free( uri );
}
}
}
delete oud;
@ -739,7 +744,12 @@ void DialogsProvider::SDMenuAction( const QString& data )
**/
void DialogsProvider::playMRL( const QString &mrl )
{
playlist_Add( THEPL, qtu(mrl), NULL,
char *uri = make_URI( qtu( mrl ), NULL );
if( unlikely( uri == NULL ) )
return;
playlist_Add( THEPL, uri, NULL,
PLAYLIST_APPEND | PLAYLIST_GO , PLAYLIST_END, true, false );
RecentsMRL::getInstance( p_intf )->addRecent( mrl );
free( uri );
}