summaryrefslogtreecommitdiff
path: root/noncore/multimedia/opieplayer2
Side-by-side diff
Diffstat (limited to 'noncore/multimedia/opieplayer2') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.cpp2
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayer.cpp6
-rw-r--r--noncore/multimedia/opieplayer2/mediawidget.cpp12
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.cpp88
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidgetgui.cpp2
-rw-r--r--noncore/multimedia/opieplayer2/threadutil.cpp2
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.cpp4
-rw-r--r--noncore/multimedia/opieplayer2/xinecontrol.cpp14
8 files changed, 65 insertions, 65 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 870b4f3..f3eafab 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -79,7 +79,7 @@ AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye
loadSkin();
connect( &mediaPlayerState, SIGNAL( loopingToggled(bool) ), this, SLOT( setLooping(bool) ) );
- connect( &mediaPlayerState, SIGNAL( isSeekableToggled( bool ) ), this, SLOT( setSeekable( bool ) ) );
+ connect( &mediaPlayerState, SIGNAL( isSeekableToggled(bool) ), this, SLOT( setSeekable(bool) ) );
connect( this, SIGNAL( forwardClicked() ), this, SLOT( skipFor() ) );
connect( this, SIGNAL( backClicked() ), this, SLOT( skipBack() ) );
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp
index 9f51006..1e6bc4d 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp
@@ -35,14 +35,14 @@ MediaPlayer::MediaPlayer( PlayListWidget &_playList, MediaPlayerState &_mediaPla
// QPEApplication::grabKeyboard(); // EVIL
connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
- connect( &mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( setPlaying( bool ) ) );
+ connect( &mediaPlayerState, SIGNAL( playingToggled(bool) ), this, SLOT( setPlaying(bool) ) );
// What is pauseCheck good for? (Simon)
-// connect( &mediaPlayerState, SIGNAL( pausedToggled( bool ) ), this, SLOT( pauseCheck( bool ) ) );
+// connect( &mediaPlayerState, SIGNAL( pausedToggled(bool) ), this, SLOT( pauseCheck(bool) ) );
connect( &mediaPlayerState, SIGNAL( next() ), this, SLOT( next() ) );
connect( &mediaPlayerState, SIGNAL( prev() ), this, SLOT( prev() ) );
- connect( &mediaPlayerState, SIGNAL( blankToggled( bool ) ), this, SLOT ( blank( bool ) ) );
+ connect( &mediaPlayerState, SIGNAL( blankToggled(bool) ), this, SLOT ( blank(bool) ) );
volControl = new VolumeControl;
Config cfg( "OpiePlayer" );
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp
index f193001..08c62a2 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.cpp
+++ b/noncore/multimedia/opieplayer2/mediawidget.cpp
@@ -29,12 +29,12 @@
MediaWidget::MediaWidget( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QWidget *parent, const char *name )
: QWidget( parent, name ), mediaPlayerState( _mediaPlayerState ), playList( _playList )
{
- connect( &mediaPlayerState, SIGNAL( displayTypeChanged( MediaPlayerState::DisplayType ) ),
- this, SLOT( setDisplayType( MediaPlayerState::DisplayType ) ) );
- connect( &mediaPlayerState, SIGNAL( lengthChanged( long ) ),
- this, SLOT( setLength( long ) ) );
- connect( &mediaPlayerState, SIGNAL( playingToggled( bool ) ),
- this, SLOT( setPlaying( bool ) ) );
+ connect( &mediaPlayerState, SIGNAL( displayTypeChanged(MediaPlayerState::DisplayType) ),
+ this, SLOT( setDisplayType(MediaPlayerState::DisplayType) ) );
+ connect( &mediaPlayerState, SIGNAL( lengthChanged(long) ),
+ this, SLOT( setLength(long) ) );
+ connect( &mediaPlayerState, SIGNAL( playingToggled(bool) ),
+ this, SLOT( setPlaying(bool) ) );
setBackgroundMode( NoBackground );
}
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 9a9e1ec..0a84268 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -63,11 +63,11 @@ PlayListWidget::PlayListWidget(QWidget* parent, const char* name, WFlags fl )
"opieplayer2/remove_from_playlist",
this , SLOT(removeSelected() ) );
d->tbPlay = new ToolButton( bar, tr( "Play" ), "opieplayer2/play",
- this , SLOT( btnPlay( bool) ), TRUE );
+ this , SLOT( btnPlay(bool) ), TRUE );
d->tbShuffle = new ToolButton( bar, tr( "Randomize" ),"opieplayer2/shuffle",
- mediaPlayerState, SLOT( setShuffled( bool ) ), TRUE );
+ mediaPlayerState, SLOT( setShuffled(bool) ), TRUE );
d->tbLoop = new ToolButton( bar, tr( "Loop" ), "opieplayer2/loop",
- mediaPlayerState, SLOT( setLooping( bool ) ), TRUE );
+ mediaPlayerState, SLOT( setLooping(bool) ), TRUE );
(void)new MenuItem( pmPlayList, tr( "Clear List" ), this, SLOT( clearList() ) );
(void)new MenuItem( pmPlayList, tr( "Add all audio files" ),
@@ -108,38 +108,38 @@ PlayListWidget::PlayListWidget(QWidget* parent, const char* name, WFlags fl )
connect( tbDeletePlaylist, ( SIGNAL( released() ) ),
SLOT( deletePlaylist() ) );
- connect( pmView, SIGNAL( activated( int ) ),
- this, SLOT( pmViewActivated( int ) ) );
- connect( skinsMenu, SIGNAL( activated( int ) ) ,
- this, SLOT( skinsMenuActivated( int ) ) );
- connect( d->selectedFiles, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int) ),
- this,SLOT( playlistViewPressed( int, QListViewItem *, const QPoint&, int ) ) );
- connect( audioView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int ) ),
- this,SLOT( viewPressed( int, QListViewItem *, const QPoint&, int ) ) );
- connect( audioView, SIGNAL( returnPressed( QListViewItem *) ),
- this,SLOT( playIt( QListViewItem *) ) );
- connect( audioView, SIGNAL( doubleClicked( QListViewItem *) ),
- this, SLOT( addToSelection( QListViewItem *) ) );
- connect( videoView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int) ),
- this,SLOT( viewPressed( int, QListViewItem *, const QPoint&, int) ) );
- connect( videoView, SIGNAL( returnPressed( QListViewItem *) ),
- this,SLOT( playIt( QListViewItem *) ) );
- connect( videoView, SIGNAL( doubleClicked( QListViewItem *) ),
- this, SLOT( addToSelection( QListViewItem *) ) );
- connect( playLists, SIGNAL( fileSelected( const DocLnk &) ),
- this, SLOT( loadList( const DocLnk & ) ) );
+ connect( pmView, SIGNAL( activated(int) ),
+ this, SLOT( pmViewActivated(int) ) );
+ connect( skinsMenu, SIGNAL( activated(int) ) ,
+ this, SLOT( skinsMenuActivated(int) ) );
+ connect( d->selectedFiles, SIGNAL( mouseButtonPressed(int,QListViewItem*,const QPoint&,int) ),
+ this,SLOT( playlistViewPressed(int,QListViewItem*,const QPoint&,int) ) );
+ connect( audioView, SIGNAL( mouseButtonPressed(int,QListViewItem*,const QPoint&,int) ),
+ this,SLOT( viewPressed(int,QListViewItem*,const QPoint&,int) ) );
+ connect( audioView, SIGNAL( returnPressed(QListViewItem*) ),
+ this,SLOT( playIt(QListViewItem*) ) );
+ connect( audioView, SIGNAL( doubleClicked(QListViewItem*) ),
+ this, SLOT( addToSelection(QListViewItem*) ) );
+ connect( videoView, SIGNAL( mouseButtonPressed(int,QListViewItem*,const QPoint&,int) ),
+ this,SLOT( viewPressed(int,QListViewItem*,const QPoint&,int) ) );
+ connect( videoView, SIGNAL( returnPressed(QListViewItem*) ),
+ this,SLOT( playIt(QListViewItem*) ) );
+ connect( videoView, SIGNAL( doubleClicked(QListViewItem*) ),
+ this, SLOT( addToSelection(QListViewItem*) ) );
+ connect( playLists, SIGNAL( fileSelected(const DocLnk&) ),
+ this, SLOT( loadList(const DocLnk&) ) );
connect( tabWidget, SIGNAL ( currentChanged(QWidget*) ),
- this, SLOT( tabChanged( QWidget* ) ) );
- connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ),
- d->tbPlay, SLOT( setOn( bool ) ) );
- connect( mediaPlayerState, SIGNAL( loopingToggled( bool ) ),
- d->tbLoop, SLOT( setOn( bool ) ) );
- connect( mediaPlayerState, SIGNAL( shuffledToggled( bool ) ),
- d->tbShuffle, SLOT( setOn( bool ) ) );
- connect( d->selectedFiles, SIGNAL( doubleClicked( QListViewItem *) ),
- this, SLOT( playIt( QListViewItem *) ) );
- connect ( gammaSlider, SIGNAL( valueChanged( int ) ),
- mediaPlayerState, SLOT( setVideoGamma( int ) ) );
+ this, SLOT( tabChanged(QWidget*) ) );
+ connect( mediaPlayerState, SIGNAL( playingToggled(bool) ),
+ d->tbPlay, SLOT( setOn(bool) ) );
+ connect( mediaPlayerState, SIGNAL( loopingToggled(bool) ),
+ d->tbLoop, SLOT( setOn(bool) ) );
+ connect( mediaPlayerState, SIGNAL( shuffledToggled(bool) ),
+ d->tbShuffle, SLOT( setOn(bool) ) );
+ connect( d->selectedFiles, SIGNAL( doubleClicked(QListViewItem*) ),
+ this, SLOT( playIt(QListViewItem*) ) );
+ connect ( gammaSlider, SIGNAL( valueChanged(int) ),
+ mediaPlayerState, SLOT( setVideoGamma(int) ) );
connect( this, SIGNAL(skinSelected() ),
m_mp, SLOT( reloadSkins() ) );
@@ -149,8 +149,8 @@ PlayListWidget::PlayListWidget(QWidget* parent, const char* name, WFlags fl )
initializeStates();
channel = new QCopChannel( "QPE/Application/opieplayer2", this );
- connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
- this, SLOT( qcopReceive(const QCString&, const QByteArray&)) );
+ connect( channel, SIGNAL(received(const QCString&,const QByteArray&)),
+ this, SLOT( qcopReceive(const QCString&,const QByteArray&)) );
cfg.setGroup("PlayList");
@@ -503,10 +503,10 @@ void PlayListWidget::tabChanged(QWidget *) {
d->tbPlay->setEnabled( true );
- disconnect( audioView, SIGNAL( itemsSelected( bool ) ),
- d->tbPlay, SLOT( setEnabled( bool ) ) );
- disconnect( videoView, SIGNAL( itemsSelected( bool ) ),
- d->tbPlay, SLOT( setEnabled( bool ) ) );
+ disconnect( audioView, SIGNAL( itemsSelected(bool) ),
+ d->tbPlay, SLOT( setEnabled(bool) ) );
+ disconnect( videoView, SIGNAL( itemsSelected(bool) ),
+ d->tbPlay, SLOT( setEnabled(bool) ) );
currentFileListView = 0;
@@ -532,8 +532,8 @@ void PlayListWidget::tabChanged(QWidget *) {
d->tbRemoveFromList->setEnabled(FALSE);
d->tbAddToList->setEnabled(TRUE);
- connect( audioView, SIGNAL( itemsSelected( bool ) ),
- d->tbPlay, SLOT( setEnabled( bool ) ) );
+ connect( audioView, SIGNAL( itemsSelected(bool) ),
+ d->tbPlay, SLOT( setEnabled(bool) ) );
d->tbPlay->setEnabled( audioView->hasSelection() );
@@ -549,8 +549,8 @@ void PlayListWidget::tabChanged(QWidget *) {
d->tbRemoveFromList->setEnabled(FALSE);
d->tbAddToList->setEnabled(TRUE);
- connect( videoView, SIGNAL( itemsSelected( bool ) ),
- d->tbPlay, SLOT( setEnabled( bool ) ) );
+ connect( videoView, SIGNAL( itemsSelected(bool) ),
+ d->tbPlay, SLOT( setEnabled(bool) ) );
d->tbPlay->setEnabled( videoView->hasSelection() );
diff --git a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
index fec91ea..33fe188 100644
--- a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
@@ -101,7 +101,7 @@ PlayListWidgetGui::PlayListWidgetGui(QWidget* parent, const char* name )
gammaMenu->insertItem( gammaSlider );
gammaMenu->insertItem( gammaLCD );
- connect( gammaSlider, SIGNAL( valueChanged( int ) ), gammaLCD, SLOT( display( int ) ) );
+ connect( gammaSlider, SIGNAL( valueChanged(int) ), gammaLCD, SLOT( display(int) ) );
vbox5 = new QVBox( this );
QVBox *vbox4 = new QVBox( vbox5 );
diff --git a/noncore/multimedia/opieplayer2/threadutil.cpp b/noncore/multimedia/opieplayer2/threadutil.cpp
index ff38b1e..fb951b4 100644
--- a/noncore/multimedia/opieplayer2/threadutil.cpp
+++ b/noncore/multimedia/opieplayer2/threadutil.cpp
@@ -240,7 +240,7 @@ OnewayNotifier::OnewayNotifier()
m_writeFd = fds[ 1 ];
m_notifier = new QSocketNotifier( m_readFd, QSocketNotifier::Read );
- connect( m_notifier, SIGNAL( activated( int ) ),
+ connect( m_notifier, SIGNAL( activated(int) ),
this, SLOT( wakeUp() ) );
}
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index c829e03..a4d09f5 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -71,8 +71,8 @@ VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye
videoFrame = new XineVideoWidget ( this, "Video frame" );
- connect ( videoFrame, SIGNAL( videoResized ( const QSize & )), this, SIGNAL( videoResized ( const QSize & )));
- connect ( videoFrame, SIGNAL( clicked () ), this, SLOT ( backToNormal() ) );
+ connect ( videoFrame, SIGNAL( videoResized(const QSize&)), this, SIGNAL( videoResized(const QSize&)));
+ connect ( videoFrame, SIGNAL( clicked() ), this, SLOT ( backToNormal() ) );
slider = 0;
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp
index a392f4a..70f2ffd 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.cpp
+++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp
@@ -65,14 +65,14 @@ XineControl::XineControl( XINE::Lib *xine, XineVideoWidget *xineWidget,
void XineControl::init()
{
- connect( &mediaPlayerState, SIGNAL( pausedToggled( bool ) ), this, SLOT( pause( bool ) ) );
- connect( this, SIGNAL( positionChanged( long ) ), &mediaPlayerState, SLOT( updatePosition( long ) ) );
- connect( &mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( stop( bool ) ) );
- connect( &mediaPlayerState, SIGNAL( fullscreenToggled( bool ) ), this, SLOT( setFullscreen( bool ) ) );
- connect( &mediaPlayerState, SIGNAL( positionChanged( long ) ), this, SLOT( seekTo( long ) ) );
- connect( &mediaPlayerState, SIGNAL( videoGammaChanged( int ) ), this, SLOT( setGamma( int ) ) );
+ connect( &mediaPlayerState, SIGNAL( pausedToggled(bool) ), this, SLOT( pause(bool) ) );
+ connect( this, SIGNAL( positionChanged(long) ), &mediaPlayerState, SLOT( updatePosition(long) ) );
+ connect( &mediaPlayerState, SIGNAL( playingToggled(bool) ), this, SLOT( stop(bool) ) );
+ connect( &mediaPlayerState, SIGNAL( fullscreenToggled(bool) ), this, SLOT( setFullscreen(bool) ) );
+ connect( &mediaPlayerState, SIGNAL( positionChanged(long) ), this, SLOT( seekTo(long) ) );
+ connect( &mediaPlayerState, SIGNAL( videoGammaChanged(int) ), this, SLOT( setGamma(int) ) );
connect( libXine, SIGNAL( stopped() ), this, SLOT( nextMedia() ) );
- connect( xineVideoWidget, SIGNAL( videoResized( const QSize & ) ), this, SLOT( videoResized ( const QSize & ) ) );
+ connect( xineVideoWidget, SIGNAL( videoResized(const QSize&) ), this, SLOT( videoResized(const QSize&) ) );
disabledSuspendScreenSaver = FALSE;
}