-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayer.cpp | 1 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 11 |
2 files changed, 8 insertions, 4 deletions
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp index 603d426..bf2acc8 100644 --- a/noncore/multimedia/opieplayer2/mediaplayer.cpp +++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp @@ -178,16 +178,17 @@ void MediaPlayer::timerEvent( QTimerEvent * ) { if ( volumeDirection == +1 ) { volControl->incVol(2); } else if ( volumeDirection == -1 ) { volControl->decVol(2); } // TODO FIXME + // huh?? unsigned int v= 0; v = volControl->volume(); v = v / 10; if ( drawnOnScreenDisplay && onScreenDisplayVolume == v ) { return; } diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp index 6c7f6ba..603a7a3 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp @@ -120,25 +120,26 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) connect( d->selectedFiles, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( playIt( QListViewItem *) ) ); readConfig( cfg ); QString currentPlaylist = cfg.readEntry( "CurrentPlaylist", "" ); loadList(DocLnk( currentPlaylist ) ); setCaption( tr( "OpiePlayer: " ) + currentPlaylist ); // see which skins are installed + videoScan=FALSE; + audioScan=FALSE; populateSkinsMenu(); initializeStates(); } PlayListWidget::~PlayListWidget() { -/* fixing symptoms and not sources is entirely stupid - zecke */ -// Config cfg( "OpiePlayer" ); -// writeConfig( cfg ); + // WTF?!@?! + if ( d->current ) { delete d->current; } delete d; } void PlayListWidget::initializeStates() { @@ -779,17 +780,17 @@ void PlayListWidget::openFile() { filename = fileDlg->text(); qDebug( "Selected filename is " + filename ); if( filename.right( 3 ) == "m3u" ) { readm3u( filename ); } else if( filename.right(3) == "pls" ) { readPls( filename ); } else { - /* FIXME ....... AUDIO/X-MPEGURL is bad*/ + // this doesnt need fixing DocLnk lnk; lnk.setName( filename ); //sets file name lnk.setFile( filename ); //sets File property //qWarning( "Mimetype: " + MimeType( QFile::encodeName(filename) ).id() ); lnk.setType( MimeType( QFile::encodeName(filename) ).id() ); lnk.setExec( "opieplayer" ); lnk.setIcon( "opieplayer2/MPEGPlayer" ); @@ -924,16 +925,18 @@ void PlayListWidget::writem3u() { qDebug( filename ); int noOfFiles = 0; d->selectedFiles->first(); do { // we dont check for existance because of url's // qDebug(d->selectedFiles->current()->file()); // so maybe we should do some net checking to ,-) + // no, cause it takes to long... + list += d->selectedFiles->current()->file() + "\n"; noOfFiles++; } while ( d->selectedFiles->next() ); qDebug( list ); if( filename.left( 1) != "/" ) { filename=QPEApplication::documentDir() + "/" + filename; } |