author | harlekin <harlekin> | 2002-08-19 18:54:10 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-08-19 18:54:10 (UTC) |
commit | aaa640a47a707b4d4e6aff37bf78c11bfc903b3c (patch) (side-by-side diff) | |
tree | 5aa2412688ce1c81f724e9d70ddf5cdc42e02618 | |
parent | 719dda9280813d323eebe3d2323271f953ed1144 (diff) | |
download | opie-aaa640a47a707b4d4e6aff37bf78c11bfc903b3c.zip opie-aaa640a47a707b4d4e6aff37bf78c11bfc903b3c.tar.gz opie-aaa640a47a707b4d4e6aff37bf78c11bfc903b3c.tar.bz2 |
cleanups
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.h | 1 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/lib.cpp | 23 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayer.cpp | 1 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayerstate.cpp | 1 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/opieplayer2.pro | 5 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 24 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/xinecontrol.cpp | 1 |
7 files changed, 15 insertions, 41 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h index e7da6c5..626004a 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.h +++ b/noncore/multimedia/opieplayer2/audiowidget.h @@ -85,3 +85,2 @@ public: void setTickerText( const QString &text ) { songInfo.setText( text ); } - bool isStreaming; public slots: diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp index 3a82a50..c187f52 100644 --- a/noncore/multimedia/opieplayer2/lib.cpp +++ b/noncore/multimedia/opieplayer2/lib.cpp @@ -89,25 +89,2 @@ Lib::Lib(XineVideoWidget* widget) { m_audioOutput= xine_load_audio_output_plugin( m_config, "oss") ; - if (m_audioOutput == NULL ) - printf("Failure\n"); - else - printf("Success\n"); - - - // test code -/* m_videoOutput = xine_load_video_output_plugin(m_config, "fb", - VISUAL_TYPE_FB, - 0 ); -*/ - - char** files = xine_list_video_output_plugins(3); - char* out; - int i = 0; - while ( ( out = files[i] ) != 0 ) { - printf("Video %s\n", out ); - i++; - } -// m_xine = xine_init( m_videoOutput, -// m_audioOutput, -// m_config ); - // test loading m_videoOutput = ::init_video_out_plugin( m_config, NULL ); diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp index 5531e81..18caaad 100644 --- a/noncore/multimedia/opieplayer2/mediaplayer.cpp +++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp @@ -95,3 +95,2 @@ void MediaPlayer::setPlaying( bool play ) { - xineControl->length(); long seconds = mediaPlayerState->length();// diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp index 6833e07..8366ab4 100644 --- a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp +++ b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp @@ -38,2 +38,3 @@ void MediaPlayerState::readConfig( Config& cfg ) { isPlaying = FALSE; + isStreaming = FALSE; isPaused = FALSE; diff --git a/noncore/multimedia/opieplayer2/opieplayer2.pro b/noncore/multimedia/opieplayer2/opieplayer2.pro index 03540a1..8cbac06 100644 --- a/noncore/multimedia/opieplayer2/opieplayer2.pro +++ b/noncore/multimedia/opieplayer2/opieplayer2.pro @@ -1,5 +1,4 @@ TEMPLATE = app -CONFIG = qt warn_on release -#CONFIG = qt warn_on debug -#release +#CONFIG = qt warn_on release +CONFIG = qt warn_on debug DESTDIR = $(OPIEDIR)/bin diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp index 39f5090..262b685 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp @@ -135,14 +135,14 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) menu->insertItem( tr( "File" ), pmPlayList ); - new MenuItem( pmPlayList, tr( "Clear List" ), this, SLOT( clearList() ) ); - new MenuItem( pmPlayList, tr( "Add all audio files" ), this, SLOT( addAllMusicToList() ) ); - new MenuItem( pmPlayList, tr( "Add all video files" ), this, SLOT( addAllVideoToList() ) ); - new MenuItem( pmPlayList, tr( "Add all files" ), this, SLOT( addAllToList() ) ); + (void)new MenuItem( pmPlayList, tr( "Clear List" ), this, SLOT( clearList() ) ); + (void)new MenuItem( pmPlayList, tr( "Add all audio files" ), this, SLOT( addAllMusicToList() ) ); + (void)new MenuItem( pmPlayList, tr( "Add all video files" ), this, SLOT( addAllVideoToList() ) ); + (void)new MenuItem( pmPlayList, tr( "Add all files" ), this, SLOT( addAllToList() ) ); pmPlayList->insertSeparator(-1); - new MenuItem( pmPlayList, tr( "Save PlayList" ), this, SLOT( saveList() ) ); - new MenuItem( pmPlayList, tr( "Export playlist to m3u" ), this, SLOT(writem3u() ) ); + (void)new MenuItem( pmPlayList, tr( "Save PlayList" ), this, SLOT( saveList() ) ); + (void)new MenuItem( pmPlayList, tr( "Export playlist to m3u" ), this, SLOT(writem3u() ) ); pmPlayList->insertSeparator(-1); - new MenuItem( pmPlayList, tr( "Open File or URL" ), this,SLOT( openFile() ) ); + (void)new MenuItem( pmPlayList, tr( "Open File or URL" ), this,SLOT( openFile() ) ); pmPlayList->insertSeparator(-1); - new MenuItem( pmPlayList, tr( "Rescan for Audio Files" ), this,SLOT( scanForAudio() ) ); - new MenuItem( pmPlayList, tr( "Rescan for Video Files" ), this,SLOT( scanForVideo() ) ); + (void)new MenuItem( pmPlayList, tr( "Rescan for Audio Files" ), this,SLOT( scanForAudio() ) ); + (void)new MenuItem( pmPlayList, tr( "Rescan for Video Files" ), this,SLOT( scanForVideo() ) ); @@ -199,5 +199,5 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) QVBox *stretch1 = new QVBox( vbox1 ); stretch1->setBackgroundMode( PaletteButton ); // add stretch - new ToolButton( vbox1, tr( "Move Up" ), "opieplayer2/up", d->selectedFiles, SLOT(moveSelectedUp()) ); - new ToolButton( vbox1, tr( "Remove" ), "opieplayer2/cut", d->selectedFiles, SLOT(removeSelected()) ); - new ToolButton( vbox1, tr( "Move Down" ), "opieplayer2/down", d->selectedFiles, SLOT(moveSelectedDown()) ); + (void)new ToolButton( vbox1, tr( "Move Up" ), "opieplayer2/up", d->selectedFiles, SLOT(moveSelectedUp()) ); + (void)new ToolButton( vbox1, tr( "Remove" ), "opieplayer2/cut", d->selectedFiles, SLOT(removeSelected()) ); + (void)new ToolButton( vbox1, tr( "Move Down" ), "opieplayer2/down", d->selectedFiles, SLOT(moveSelectedDown()) ); QVBox *stretch2 = new QVBox( vbox1 ); stretch2->setBackgroundMode( PaletteButton ); // add stretch diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp index c03ea16..766ece2 100644 --- a/noncore/multimedia/opieplayer2/xinecontrol.cpp +++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp @@ -93,3 +93,2 @@ void XineControl::play( const QString& fileName ) { // determine if slider is shown - // mediaPlayerState->setIsStreaming( mdetect.isStreaming( fileName ) ); mediaPlayerState->setIsStreaming( !libXine->isSeekable() ); |