# include "config.h"
#endif
-#include <vlc_common.h>
#include <vlc_intf_strings.h>
#include "qt4.hpp"
#include "dialogs_provider.hpp"
+#include "input_manager.hpp" /* Load Subtitles */
#include "menus.hpp"
-#include "input_manager.hpp"
#include "recents.hpp"
-#include "util/qvlcapp.hpp"
+#include "util/qt_dirs.hpp"
/* The dialogs */
#include "dialogs/playlist.hpp"
#include "dialogs/podcast_configuration.hpp"
#include "dialogs/toolbar.hpp"
#include "dialogs/plugins.hpp"
+#include "dialogs/interaction.hpp"
#include <QEvent>
#include <QApplication>
void DialogsProvider::quit()
{
- /* Stop the playlist */
- playlist_Stop( THEPL );
b_isDying = true;
vlc_object_kill( p_intf->p_libvlc );
- QApplication::closeAllWindows();
- QApplication::quit();
}
void DialogsProvider::customEvent( QEvent *event )
{
QString mrl = dir.endsWith( "VIDEO_TS", Qt::CaseInsensitive ) ?
"dvd://" : "directory://" + toNativeSeparators( dir );
- input_item_t *p_input = input_item_NewExt( THEPL, qtu( mrl ),
- NULL, 0, NULL, -1 );
+ input_item_t *p_input = input_item_New( THEPL, qtu( mrl ), NULL );
/* FIXME: playlist_AddInput() can fail */
playlist_AddInput( THEPL, p_input,
QString file = qfd->selectedFiles().first();
QString filter = qfd->selectedFilter();
- const char* filt = filter.toAscii();
if( file.contains( ".xsp" ) || filter.contains( "XSPF" ) )
{
if( s->exec() == QDialog::Accepted )
{
- msg_Dbg( p_intf, "Sout mrl %s", qta( s->getMrl() ) );
- /* Just do it */
- int i_len = strlen( qtu( s->getMrl() ) ) + 10;
- char *psz_option = (char*)malloc( i_len );
- snprintf( psz_option, i_len - 1, "%s", qtu( s->getMrl() ) );
+ const char *psz_option = qtu( s->getMrl() );
+ msg_Dbg( p_intf, "Sout mrl %s", psz_option );
playlist_AddExt( THEPL, qtu( mrl ), "Streaming",
PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END,
- -1, &psz_option, 1, true, pl_Unlocked );
+ -1, 1, &psz_option, VLC_INPUT_OPTION_TRUSTED, true, pl_Unlocked );
RecentsMRL::getInstance( p_intf )->addRecent( mrl );
}
}
void DialogsProvider::menuAction( QObject *data )
{
- QVLCMenu::DoAction( p_intf, data );
+ QVLCMenu::DoAction( data );
}
void DialogsProvider::menuUpdateAction( QObject *data )
void DialogsProvider::SDMenuAction( QString data )
{
- char *psz_sd = qtu( data );
+ const char *psz_sd = qtu( data );
if( !playlist_IsServicesDiscoveryLoaded( THEPL, psz_sd ) )
playlist_ServicesDiscoveryAdd( THEPL, psz_sd );
else