#include "util/input_slider.hpp"
#include "util/qvlcframe.hpp"
#include "dialogs_provider.hpp"
-#include "components/video_widget.hpp"
+#include "components/interface_widgets.hpp"
+#include "dialogs/playlist.hpp"
+#include "menus.hpp"
+
+#include <QMenuBar>
#include <QCloseEvent>
-#include <assert.h>
#include <QPushButton>
#include <QStatusBar>
#include <QKeyEvent>
-#include "menus.hpp"
+
+#include <assert.h>
#include <vlc_keys.h>
+#include <vlc/vout.h>
+#include <aout_internal.h>
#ifdef WIN32
#define PREF_W 410
#define PREF_H 125
#endif
+#define VISIBLE(i) (i && i->isVisible())
+
+#define SET_WIDTH(i,j) i->widgetSize.setWidth(j)
+#define SET_HEIGHT(i,j) i->widgetSize.setHeight(j)
+#define SET_WH( i,j,k) i->widgetSize.setWidth(j); i->widgetSize.setHeight(k);
+
+#define DS(i) i.width(),i.height()
+
static int InteractCallback( vlc_object_t *, const char *, vlc_value_t,
vlc_value_t, void *);
+/* Video handling */
+static void *DoRequest( intf_thread_t *p_intf, vout_thread_t *p_vout,
+ int *pi1, int *pi2, unsigned int*pi3,unsigned int*pi4)
+{
+ return p_intf->p_sys->p_mi->requestVideo( p_vout, pi1, pi2, pi3, pi4 );
+}
+static void DoRelease( intf_thread_t *p_intf, void *p_win )
+{
+ return p_intf->p_sys->p_mi->releaseVideo( p_win );
+}
+static int DoControl( intf_thread_t *p_intf, void *p_win, int i_q, va_list a )
+{
+ return p_intf->p_sys->p_mi->controlVideo( p_win, i_q, a );
+}
+
+bool embeddedPlaylistWasActive;
+bool videoIsActive;
+QSize savedVideoSize;
MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
{
- /* All UI stuff */
- QWidget *main = new QWidget( this );
- setCentralWidget( main );
- setWindowTitle( QString::fromUtf8( _("VLC media player") ) );
- ui.setupUi( centralWidget() );
+ settings = new QSettings( "VideoLAN", "VLC" );
+ settings->beginGroup( "MainWindow" );
- setFocusPolicy( Qt::StrongFocus );
+ need_components_update = false;
+ bgWidget = NULL; videoWidget = NULL; playlistWidget = NULL;
+ embeddedPlaylistWasActive = videoIsActive = false;
- slider = new InputSlider( Qt::Horizontal, NULL );
- ui.hboxLayout->insertWidget( 0, slider );
- ui.prevButton->setText( "" );
- ui.nextButton->setText( "" );
- ui.playButton->setText( "" );
- ui.stopButton->setText( "" );
- ui.prevButton->setIcon( QIcon( ":/pixmaps/previous.png" ) );
- ui.nextButton->setIcon( QIcon( ":/pixmaps/next.png" ) );
- ui.playButton->setIcon( QIcon( ":/pixmaps/play.png" ) );
- ui.stopButton->setIcon( QIcon( ":/pixmaps/stop.png" ) );
- ui.volLowLabel->setPixmap( QPixmap( ":/pixmaps/volume-low.png" ) );
- ui.volHighLabel->setPixmap( QPixmap( ":/pixmaps/volume-high.png" ) );
- ui.volumeSlider->setMaximum( 100 );
- ui.playlistButton->setText( "" );
- ui.playlistButton->setIcon( QIcon( ":/pixmaps/volume-low.png" ) );
+ /* Fetch configuration from settings and vlc config */
+ videoEmbeddedFlag = false;
+ if( config_GetInt( p_intf, "embedded-video" ) )
+ videoEmbeddedFlag = true;
- VolumeClickHandler *h = new VolumeClickHandler( this );
- ui.volLowLabel->installEventFilter(h);
- ui.volHighLabel->installEventFilter(h);
+ alwaysVideoFlag = false;
+ if( videoEmbeddedFlag && config_GetInt( p_intf, "qt-always-video" ))
+ alwaysVideoFlag = true;
- ui.volumeSlider->setFocusPolicy( Qt::NoFocus );
+ playlistEmbeddedFlag = settings->value( "playlist-embedded", true ).
+ toBool();
+ advControlsEnabled= settings->value( "adv-controls", false ).toBool();
+
+ setWindowTitle( QString::fromUtf8( _("VLC media player") ) );
+ handleMainUi( settings );
- QVLCMenu::createMenuBar( menuBar(), p_intf );
+ QVLCMenu::createMenuBar( this, p_intf, playlistEmbeddedFlag,
+ advControlsEnabled );
+ /* Status bar */
timeLabel = new QLabel( 0 );
nameLabel = new QLabel( 0 );
statusBar()->addWidget( nameLabel, 4 );
statusBar()->addPermanentWidget( timeLabel, 1 );
- resize ( PREF_W, PREF_H );
- if( config_GetInt( p_intf, "embedded" ) )
- {
- videoWidget = new VideoWidget( p_intf, config_GetInt( p_intf,
- "qt-always-video" ) ? true:false );
- if( config_GetInt( p_intf, "qt-always-video" ) )
- {
- QSettings settings( "VideoLAN", "VLC" );
- settings.beginGroup( "MainWindow" );
- videoSize = settings.value( "videoSize", QSize( 200, 200 ) ).
- toSize();
- }
- else
- videoSize = QSize( 1,1 );
- videoWidget->resize( videoSize );
- ui.vboxLayout->insertWidget( 0, videoWidget );
- }
- readSettings( "MainWindow" );
-
- addSize = QSize( ui.vboxLayout->margin() * 2, PREF_H );
- mainSize.setWidth( videoSize.width() + addSize.width() );
- mainSize.setHeight( videoSize.height() + addSize.height() );
- resize( mainSize );
- mainSize = size();
-
- setMinimumSize( PREF_W, addSize.height() );
+ setFocusPolicy( Qt::StrongFocus );
/* Init input manager */
MainInputManager::getInstance( p_intf );
+ ON_TIMEOUT( updateOnTimer() );
/* Volume control */
- connect( ui.volumeSlider, SIGNAL( valueChanged(int) ),
- this, SLOT( updateVolume(int) ) );
-
- /* Get timer updates */
- connect( THEDP->fixed_timer, SIGNAL( timeout() ),
- this, SLOT(updateOnTimer() ) );
-
+ CONNECT( ui.volumeSlider, valueChanged(int), this, updateVolume(int) );
/* Connect the input manager to the GUI elements it manages */
- connect( THEMIM->getIM(),SIGNAL(positionUpdated( float, int, int ) ),
- slider, SLOT( setPosition( float,int, int ) ) );
- connect( THEMIM->getIM(), SIGNAL( positionUpdated( float, int, int ) ),
- this, SLOT( setDisplay( float, int, int ) ) );
- connect( THEMIM->getIM(), SIGNAL( nameChanged( QString ) ),
- this, SLOT( setName( QString ) ) );
- connect( THEMIM->getIM(), SIGNAL( statusChanged( int ) ),
- this, SLOT( setStatus( int ) ) );
- connect( slider, SIGNAL( sliderDragged( float ) ),
- THEMIM->getIM(),SLOT( sliderUpdate( float ) ) );
-
- /* Actions */
- connect( ui.playButton, SIGNAL( clicked() ), this, SLOT( play() ) );
- connect( ui.stopButton, SIGNAL( clicked() ), this, SLOT( stop() ) );
- connect( ui.nextButton, SIGNAL( clicked() ), this, SLOT( next() ) );
- connect( ui.prevButton, SIGNAL( clicked() ), this, SLOT( prev() ) );
-
- connect( ui.playlistButton, SIGNAL(clicked()),
- THEDP, SLOT( playlistDialog() ) );
+ CONNECT( THEMIM->getIM(), positionUpdated( float, int, int ),
+ slider, setPosition( float,int, int ) );
+ CONNECT( THEMIM->getIM(), positionUpdated( float, int, int ),
+ this, setDisplay( float, int, int ) );
+ CONNECT( THEMIM->getIM(), nameChanged( QString ), this,setName( QString ) );
+ CONNECT( THEMIM->getIM(), statusChanged( int ), this, setStatus( int ) );
+ CONNECT( slider, sliderDragged( float ),
+ THEMIM->getIM(), sliderUpdate( float ) );
var_Create( p_intf, "interaction", VLC_VAR_ADDRESS );
var_AddCallback( p_intf, "interaction", InteractCallback, this );
MainInterface::~MainInterface()
{
- writeSettings( "MainWindow" );
- if( config_GetInt( p_intf, "qt-always-video" ) )
- {
- QSettings s("VideoLAN", "VLC" );
- s.beginGroup( "MainWindow" );
- s.setValue( "videoSize", videoSize );
- s.endGroup();
- }
+ settings->setValue( "playlist-embedded", playlistEmbeddedFlag );
+ settings->setValue( "adv-controls", advControlsEnabled );
+ settings->setValue( "pos", pos() );
+ settings->endGroup();
+ delete settings;
p_intf->b_interaction = VLC_FALSE;
var_DelCallback( p_intf, "interaction", InteractCallback, this );
+
+ p_intf->pf_request_window = NULL;
+ p_intf->pf_release_window = NULL;
+ p_intf->pf_control_window = NULL;
+}
+
+void MainInterface::handleMainUi( QSettings *settings )
+{
+ QWidget *main = new QWidget( this );
+ setCentralWidget( main );
+ ui.setupUi( centralWidget() );
+
+ slider = new InputSlider( Qt::Horizontal, NULL );
+ ui.hboxLayout->insertWidget( 0, slider );
+
+ BUTTON_SET_ACT_I( ui.prevButton, "" , previous.png,
+ qtr("Previous"), prev() );
+ BUTTON_SET_ACT_I( ui.nextButton, "", next.png, qtr("Next"), next() );
+ BUTTON_SET_ACT_I( ui.playButton, "", play.png, qtr("Play"), play() );
+ BUTTON_SET_ACT_I( ui.stopButton, "", stop.png, qtr("Stop"), stop() );
+ BUTTON_SET_ACT_I( ui.visualButton, "", stop.png,
+ qtr( "Audio visualizations" ), visual() );
+
+ /* Volume */
+ ui.volMuteLabel->setPixmap( QPixmap( ":/pixmaps/volume-low.png" ) );
+ ui.volumeSlider->setMaximum( 100 );
+ ui.volMuteLabel->setToolTip( qtr( "Mute" ) );
+ VolumeClickHandler *h = new VolumeClickHandler( p_intf, this );
+ ui.volMuteLabel->installEventFilter(h);
+ ui.volumeSlider->setFocusPolicy( Qt::NoFocus );
+
+ BUTTON_SET_IMG( ui.playlistButton, "" ,volume-low.png,
+ playlistEmbeddedFlag ? qtr( "Show playlist" ) :
+ qtr( "Open playlist" ) );
+ BUTTONACT( ui.playlistButton, playlist() );
+
+ /* Set initial size */
+ resize ( PREF_W, PREF_H );
+
+ addSize = QSize( ui.vboxLayout->margin() * 2, PREF_H );
+
+ advControls = new ControlsWidget( p_intf );
+ ui.vboxLayout->insertWidget( 0, advControls );
+ advControls->updateGeometry();
+ if( !advControlsEnabled ) advControls->hide();
+ need_components_update = true;
+
+ visualSelector = new VisualSelector( p_intf );
+ ui.vboxLayout->insertWidget( 0, visualSelector );
+ visualSelector->hide();
+
+ if( alwaysVideoFlag )
+ {
+ bgWidget = new BackgroundWidget( p_intf );
+ bgWidget->widgetSize = settings->value( "backgroundSize",
+ QSize( 200, 200 ) ).toSize();
+ bgWidget->resize( bgWidget->widgetSize );
+ bgWidget->updateGeometry();
+ ui.vboxLayout->insertWidget( 0, bgWidget );
+ }
+
+ if( videoEmbeddedFlag )
+ {
+ videoWidget = new VideoWidget( p_intf );
+ videoWidget->widgetSize = QSize( 1, 1 );
+ videoWidget->resize( videoWidget->widgetSize );
+ ui.vboxLayout->insertWidget( 0, videoWidget );
+
+ p_intf->pf_request_window = ::DoRequest;
+ p_intf->pf_release_window = ::DoRelease;
+ p_intf->pf_control_window = ::DoControl;
+ }
+ setMinimumSize( PREF_W, addSize.height() );
+}
+
+/**********************************************************************
+ * Handling of the components
+ **********************************************************************/
+void MainInterface::calculateInterfaceSize()
+{
+ int width = 0, height = 0;
+ if( VISIBLE( bgWidget ) )
+ {
+ width = bgWidget->widgetSize.width();
+ height = bgWidget->widgetSize.height();
+ assert( !(playlistWidget && playlistWidget->isVisible() ) );
+ }
+ else if( VISIBLE( playlistWidget ) )
+ {
+ width = playlistWidget->widgetSize.width();
+ height = playlistWidget->widgetSize.height();
+ fprintf( stderr, "Have %ix%i playlist\n", width, height );
+ }
+ else if( videoIsActive )
+ {
+ width = videoWidget->widgetSize.width() ;
+ height = videoWidget->widgetSize.height();
+ fprintf( stderr, "Video Size %ix%i\n", DS( videoWidget->widgetSize ) );
+ }
+ else
+ {
+ width = PREF_W - addSize.width();
+ height = PREF_H - addSize.height();
+ }
+ if( VISIBLE( visualSelector ) )
+ height += visualSelector->height();
+ fprintf( stderr, "Adv %p - visible %i\n", advControls, advControls->isVisible() );
+ if( VISIBLE( advControls) )
+ {
+ fprintf( stderr, "visible\n" );
+ height += advControls->sizeHint().height();
+ }
+
+ fprintf( stderr, "Adv height %i\n", advControls->sizeHint().height() );
+ fprintf( stderr, "Setting to %ix%i\n",
+ width + addSize.width() , height + addSize.height() );
+
+ mainSize = QSize( width + addSize.width(), height + addSize.height() );
}
void MainInterface::resizeEvent( QResizeEvent *e )
{
- videoSize.setHeight( e->size().height() - addSize.height() );
- videoSize.setWidth( e->size().width() - addSize.width() );
- p_intf->p_sys->p_video->updateGeometry() ;
+ fprintf( stderr, "Resize event to %ix%i\n", DS( e->size() ) );
+ videoWidget->widgetSize.setWidth( e->size().width() - addSize.width() );
+ if( videoWidget && videoIsActive && videoWidget->widgetSize.height() > 1 )
+ {
+ SET_WH( videoWidget, e->size().width() - addSize.width(),
+ e->size().height() - addSize.height() );
+ videoWidget->updateGeometry();
+ }
+ if( VISIBLE( playlistWidget ) )
+ {
+ SET_WH( playlistWidget , e->size().width() - addSize.width(),
+ e->size().height() - addSize.height() );
+ playlistWidget->updateGeometry();
+ }
+}
+
+void *MainInterface::requestVideo( vout_thread_t *p_nvout, int *pi_x,
+ int *pi_y, unsigned int *pi_width,
+ unsigned int *pi_height )
+{
+ void *ret = videoWidget->request( p_nvout,pi_x, pi_y, pi_width, pi_height );
+ if( ret )
+ {
+ videoIsActive = true;
+ if( VISIBLE( playlistWidget ) )
+ {
+ embeddedPlaylistWasActive = true;
+ playlistWidget->hide();
+ }
+ bool bgWasVisible = false;
+ if( VISIBLE( bgWidget) )
+ {
+ bgWasVisible = true;
+ bgWidget->hide();
+ }
+ if( THEMIM->getIM()->hasVideo() || !bgWasVisible )
+ {
+ videoWidget->widgetSize = QSize( *pi_width, *pi_height );
+ }
+ else /* Background widget available, use its size */
+ {
+ /* Ok, our visualizations are bad, so don't do this for the moment
+ * use the requested size anyway */
+ // videoWidget->widgetSize = bgWidget->widgeTSize;
+ videoWidget->widgetSize = QSize( *pi_width, *pi_height );
+ }
+ videoWidget->updateGeometry(); /// FIXME: Needed ?
+ need_components_update = true;
+ }
+ return ret;
+}
+
+void MainInterface::releaseVideo( void *p_win )
+{
+ videoWidget->release( p_win );
+ videoWidget->widgetSize = QSize( 0, 0 );
+ videoWidget->resize( videoWidget->widgetSize );
+
+ if( embeddedPlaylistWasActive )
+ playlistWidget->show();
+ else if( bgWidget )
+ bgWidget->show();
+
+ videoIsActive = false;
+ need_components_update = true;
}
+int MainInterface::controlVideo( void *p_window, int i_query, va_list args )
+{
+ int i_ret = VLC_EGENERIC;
+ switch( i_query )
+ {
+ case VOUT_GET_SIZE:
+ {
+ unsigned int *pi_width = va_arg( args, unsigned int * );
+ unsigned int *pi_height = va_arg( args, unsigned int * );
+ *pi_width = videoWidget->widgetSize.width();
+ *pi_height = videoWidget->widgetSize.height();
+ i_ret = VLC_SUCCESS;
+ break;
+ }
+ case VOUT_SET_SIZE:
+ {
+ unsigned int i_width = va_arg( args, unsigned int );
+ unsigned int i_height = va_arg( args, unsigned int );
+// if( !i_width && p_vout ) i_width = p_vout->i_window_width;
+// if( !i_height && p_vout ) i_height = p_vout->i_window_height;
+ videoWidget->widgetSize = QSize( i_width, i_height );
+ videoWidget->updateGeometry();
+ need_components_update = true;
+ i_ret = VLC_SUCCESS;
+ break;
+ }
+ case VOUT_SET_STAY_ON_TOP:
+ default:
+ msg_Warn( p_intf, "unsupported control query" );
+ break;
+ }
+ return i_ret;
+}
+
+void MainInterface::advanced()
+{
+ if( !VISIBLE( advControls ) )
+ {
+ advControls->show();
+ advControlsEnabled = true;
+ }
+ else
+ {
+ advControls->hide();
+ advControlsEnabled = false;
+ }
+ doComponentsUpdate();
+}
+
+void MainInterface::visual()
+{
+ if( !VISIBLE( visualSelector) )
+ {
+ visualSelector->show();
+ if( !THEMIM->getIM()->hasVideo() )
+ {
+ /* Show the background widget */
+ }
+ }
+ else
+ {
+ /* Stop any currently running visualization */
+ visualSelector->hide();
+ }
+ doComponentsUpdate();
+}
+
+void MainInterface::playlist()
+{
+ // Toggle the playlist dialog
+ if( !playlistEmbeddedFlag )
+ {
+ if( playlistWidget )
+ {
+ /// \todo Destroy it
+ }
+ THEDP->playlistDialog();
+ return;
+ }
+
+ if( !playlistWidget )
+ {
+ PlaylistDialog::killInstance();
+ playlistWidget = new PlaylistWidget( p_intf );
+ ui.vboxLayout->insertWidget( 0, playlistWidget );
+ playlistWidget->widgetSize = settings->value( "playlistSize",
+ QSize( 650, 310 ) ).toSize();
+ playlistWidget->hide();
+ }
+ /// Todo, reset its size ?
+ if( VISIBLE( playlistWidget) )
+ {
+ playlistWidget->hide();
+ if( videoIsActive )
+ {
+ videoWidget->widgetSize = savedVideoSize;
+ videoWidget->resize( videoWidget->widgetSize );
+ videoWidget->updateGeometry();
+ }
+ }
+ else
+ {
+ playlistWidget->show();
+ if( videoIsActive )
+ {
+ savedVideoSize = videoWidget->widgetSize;
+ videoWidget->widgetSize.setHeight( 0 );
+ videoWidget->resize( videoWidget->widgetSize );
+ videoWidget->updateGeometry();
+ }
+ if( VISIBLE( bgWidget ) ) bgWidget->hide();
+ }
+ doComponentsUpdate();
+}
+
+/* Video widget cannot do this synchronously as it runs in another thread */
+/* Well, could it, actually ? Probably dangerous ... */
+void MainInterface::doComponentsUpdate()
+{
+ calculateInterfaceSize();
+ resize( mainSize );
+}
+
+void MainInterface::undockPlaylist()
+{
+ if( playlistWidget )
+ {
+ playlistWidget->hide();
+ playlistWidget->deleteLater();
+ ui.vboxLayout->removeWidget( playlistWidget );
+ playlistWidget = NULL;
+ playlistEmbeddedFlag = false;
+
+ menuBar()->clear();
+ QVLCMenu::createMenuBar( this, p_intf, false, advControlsEnabled );
+
+ if( videoIsActive )
+ {
+ videoWidget->widgetSize = savedVideoSize;
+ videoWidget->resize( videoWidget->widgetSize );
+ videoWidget->updateGeometry();
+ }
+
+ doComponentsUpdate();
+ THEDP->playlistDialog();
+ }
+}
+
+void MainInterface::customEvent( QEvent *event )
+{
+ if( event->type() == PLDockEvent_Type )
+ {
+ PlaylistDialog::killInstance();
+ playlistEmbeddedFlag = true;
+ menuBar()->clear();
+ QVLCMenu::createMenuBar(this, p_intf, true, advControlsEnabled );
+ playlist();
+ }
+}
+
+/************************************************************************
+ * Other stuff
+ ************************************************************************/
void MainInterface::keyPressEvent( QKeyEvent *e )
{
int i_vlck = 0;
if( e->modifiers()& Qt::ControlModifier ) i_vlck |= KEY_MODIFIER_CTRL;
if( e->modifiers()& Qt::MetaModifier ) i_vlck |= KEY_MODIFIER_META;
- fprintf( stderr, "After modifiers %x\n", i_vlck );
bool found = false;
- fprintf( stderr, "Qt %x\n", e->key() );
/* Look for some special keys */
#define HANDLE( qt, vk ) case Qt::qt : i_vlck |= vk; found = true;break
switch( e->key() )
HANDLE( Key_Delete, KEY_DELETE );
}
- fprintf( stderr, "After keys %x\n", i_vlck );
if( !found )
{
/* Force lowercase */
}
if( i_vlck >= 0 )
{
- var_SetInteger( p_intf->p_vlc, "key-pressed", i_vlck );
+ var_SetInteger( p_intf->p_libvlc, "key-pressed", i_vlck );
e->accept();
}
else
if( !THEPL->i_size || !THEPL->i_enabled )
{
/* The playlist is empty, open a file requester */
- THEDP->openDialog();
+ THEDP->simpleOpenDialog();
setStatus( 0 );
return;
}
void MainInterface::updateOnTimer()
{
+ aout_instance_t *p_aout = (aout_instance_t *)vlc_object_find( p_intf,
+ VLC_OBJECT_AOUT, FIND_ANYWHERE );
+ /* Todo: make this event-driven */
+ if( p_aout )
+ {
+ ui.visualButton->setEnabled( true );
+ vlc_object_release( p_aout );
+ }
+ else
+ ui.visualButton->setEnabled( false );
+
+ /* And this too */
+ advControls->enableInput( THEMIM->getIM()->hasInput() );
+ advControls->enableVideo( THEMIM->getIM()->hasVideo() );
+
if( p_intf->b_die )
{
+ QApplication::closeAllWindows();
+ DialogsProvider::killInstance();
QApplication::quit();
}
+ if( need_components_update )
+ {
+ doComponentsUpdate();
+ need_components_update = false;
+ }
+
audio_volume_t i_volume;
aout_VolumeGet( p_intf, &i_volume );
i_volume = (i_volume * 200 )/ AOUT_VOLUME_MAX ;
{
intf_dialog_args_t *p_arg = new intf_dialog_args_t;
p_arg->p_dialog = (interaction_dialog_t *)(new_val.p_address);
-
- MainInterface *p_interface = (MainInterface*)param;
DialogEvent *event = new DialogEvent( INTF_DIALOG_INTERACTION, 0, p_arg );
QApplication::postEvent( THEDP, static_cast<QEvent*>(event) );
return VLC_SUCCESS;
projects / vlc / blobdiff