author | llornkcor <llornkcor> | 2002-10-08 18:31:28 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-10-08 18:31:28 (UTC) |
commit | 7599e0a20572d44ca805e6effb878601c707fd05 (patch) (side-by-side diff) | |
tree | 2bc2342b16338ca395528456705e38ede850d653 /noncore/multimedia/opieplayer2 | |
parent | 9475b63d025c1ca386764784b7dad460935f45b0 (diff) | |
download | opie-7599e0a20572d44ca805e6effb878601c707fd05.zip opie-7599e0a20572d44ca805e6effb878601c707fd05.tar.gz opie-7599e0a20572d44ca805e6effb878601c707fd05.tar.bz2 |
more fixes
Diffstat (limited to 'noncore/multimedia/opieplayer2') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayer.cpp | 2 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/om3u.cpp | 25 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 175 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.h | 3 |
4 files changed, 74 insertions, 131 deletions
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp index 8da7f73..5069a49 100644 --- a/noncore/multimedia/opieplayer2/mediaplayer.cpp +++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp @@ -336,11 +336,11 @@ void MediaPlayer::keyReleaseEvent( QKeyEvent *e) { } } void MediaPlayer::cleanUp() {// this happens on closing Config cfg( "OpiePlayer" ); mediaPlayerState->writeConfig( cfg ); - playList->writeConfig( cfg ); + playList->writeDefaultPlaylist( ); // QPEApplication::grabKeyboard(); // QPEApplication::ungrabKeyboard(); } diff --git a/noncore/multimedia/opieplayer2/om3u.cpp b/noncore/multimedia/opieplayer2/om3u.cpp index c947033..0be727b 100644 --- a/noncore/multimedia/opieplayer2/om3u.cpp +++ b/noncore/multimedia/opieplayer2/om3u.cpp @@ -60,36 +60,36 @@ Om3u::Om3u( const QString &filePath, int mode) f.open(mode); } Om3u::~Om3u(){} -void Om3u::readM3u() { //it's m3u +void Om3u::readM3u() { // qDebug("<<<<<<reading m3u "+f.name()); QTextStream t(&f); QString s; while ( !t.atEnd() ) { s=t.readLine(); - // qDebug(s); + qDebug(s); if( s.find( "#", 0, TRUE) == -1 ) { if( s.left(2) == "E:" || s.left(2) == "P:" ) { s = s.right( s.length() -2 ); QFileInfo f( s ); QString name = f.baseName(); name = name.right( name.length() - name.findRev( "\\", -1, TRUE ) -1 ); s=s.replace( QRegExp( "\\" ), "/" ); append(s); // qDebug(s); } else { // is url s.replace( QRegExp( "%20" )," " ); QString name; - if( name.left( 4 ) == "http" ) { - name = s.right( s.length() - 7 ); - } else { +// if( name.left( 4 ) == "http" ) { +// name = s.right( s.length() - 7 ); +// } else { name = s; - } +// } append(name); // qDebug(name); } } } } @@ -134,24 +134,35 @@ void Om3u::write() { //writes list to m3u file QString list; for ( QStringList::ConstIterator it = begin(); it != end(); ++it ) { qDebug(*it); list += *it+"\n"; } f.writeBlock( list, list.length() ); - f.close(); +// f.close(); } void Om3u::add(const QString &filePath) { //adds to m3u file append(filePath); } void Om3u::remove(const QString &filePath) { //removes from m3u list + QString list, currentFile; + for ( QStringList::ConstIterator it = begin(); it != end(); ++it ) { + currentFile=*it; +// qDebug(*it); + + if( filePath != currentFile) + list += currentFile+"\n"; + } + f.writeBlock( list, list.length() ); } void Om3u::deleteFile(const QString &filePath) {//deletes m3u file + f.close(); + f.remove(); } void Om3u::close() { //closes m3u file f.close(); } diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp index 897c458..cc4be23 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp @@ -173,107 +173,33 @@ void PlayListWidget::initializeStates() { d->tbPlay->setOn( mediaPlayerState->playing() ); d->tbLoop->setOn( mediaPlayerState->looping() ); d->tbShuffle->setOn( mediaPlayerState->shuffled() ); setPlaylist( true ); } - -void PlayListWidget::readConfig( Config& cfg ) { - - cfg.setGroup( "PlayList" ); - QString currentString = cfg.readEntry( "current", "" ); - int noOfFiles = cfg.readNumEntry( "NumberOfFiles", 0 ); - - for ( int i = 0; i < noOfFiles; i++ ) { - QString entryName; - entryName.sprintf( "File%i", i + 1 ); - - QString linkFile = cfg.readEntry( entryName ); - - qDebug("reading "+linkFile); - - if( QFileInfo( linkFile ).exists() ) { - - DocLnk lnk( linkFile ); - - if ( QFileInfo( lnk.file() ).exists() || - - linkFile.find( "http" , 0, TRUE) != -1) { - - d->selectedFiles->addToSelection( lnk ); - } - } - } - d->selectedFiles->setSelectedItem( currentString ); -} - - -void PlayListWidget::writeConfig( Config& cfg ) const { +void PlayListWidget::writeDefaultPlaylist() { Config config( "OpiePlayer" ); config.setGroup( "PlayList" ); - -// if(config.readBoolEntry("newPlaylist")) { -// new for testing - QString name, filename, list; + QString filename=QPEApplication::documentDir() + "/default.m3u"; + QString currentString = config.readEntry( "CurrentPlaylist", filename); + if( currentString == filename) { Om3u *m3uList; - name = "default"; - - filename=QPEApplication::documentDir() + "/" + name+".m3u"; - m3uList = new Om3u(filename, IO_ReadWrite); +// qDebug("<<<<<<<<<<<<<default>>>>>>>>>>>>>>>>>>>"); + m3uList = new Om3u(filename, IO_ReadWrite | IO_Truncate); d->selectedFiles->first(); do { - qDebug(d->selectedFiles->current()->file()); +// qDebug(d->selectedFiles->current()->file()); m3uList->add( d->selectedFiles->current()->file() ); } while ( d->selectedFiles->next() ); - // qDebug( list ); - // m3uList->write(); + m3uList->write(); m3uList->close(); if(m3uList) delete m3uList; - - DocLnk lnk; - lnk.setFile( filename); - lnk.setIcon("opieplayer2/playlist2"); - lnk.setName( name); //sets file name - - qDebug("writing default playlist "+filename); - - config.writeEntry("CurrentPlaylist", filename); -// currentPlayList=filename; - if(!lnk.writeLink()) { - qDebug("Writing doclink did not work"); } -// } else { - -// d->selectedFiles->writeCurrent( cfg ); -// int noOfFiles = 0; -// d->selectedFiles->first(); - -// do { -// const DocLnk *lnk = d->selectedFiles->current(); - -// if ( lnk ) { - -// QString entryName; -// entryName.sprintf( "File%i", noOfFiles + 1 ); - -// cfg.writeEntry( entryName, lnk->linkFile() ); -// // if this link does exist, add it so we have the file -// // next time... - -// if ( !QFile::exists( lnk->linkFile() ) ) { -// lnk->writeLink(); -// } -// } -// noOfFiles++; -// } -// while ( d->selectedFiles->next() ); -// cfg.writeEntry("NumberOfFiles", noOfFiles ); -// } } void PlayListWidget::addToSelection( const DocLnk& lnk ) { d->setDocumentUsed = FALSE; if ( mediaPlayerState->playlist() ) { if( QFileInfo( lnk.file() ).exists() || @@ -357,30 +283,30 @@ void PlayListWidget::addAllVideoToList() { } writeCurrentM3u(); } void PlayListWidget::setDocument( const QString& fileref ) { - //qDebug( fileref ); + qDebug( "<<<<<<<<set document>>>>>>>>>> "+fileref ); fromSetDocument = TRUE; if ( fileref.isNull() ) { QMessageBox::critical( 0, tr( "Invalid File" ), tr( "There was a problem in getting the file." ) ); return; } + clearList(); if( fileref.find( "m3u", 0, TRUE) != -1 ) { //is m3u readm3u( fileref ); + } else if( DocLnk( fileref).file().find( "m3u", 0, TRUE) != -1 ) { + readm3u( DocLnk( fileref).file() ); } else if( fileref.find( "pls", 0, TRUE) != -1 ) { //is pls readPls( fileref ); - }// else if( fileref.find( "playlist", 0, TRUE) != -1 ) {//is playlist -// clearList(); -// loadList( DocLnk( fileref ) ); -// d->selectedFiles->first(); -// } - else { + } else if( DocLnk( fileref).file().find( "pls", 0, TRUE) != -1 ) { + readPls( DocLnk( fileref).file() ); + } else { clearList(); addToSelection( DocLnk( fileref ) ); d->setDocumentUsed = TRUE; mediaPlayerState->setPlaying( FALSE ); mediaPlayerState->setPlaying( TRUE ); } @@ -504,13 +430,13 @@ void PlayListWidget::setPlaylist( bool shown ) { d->playListFrame->hide(); } } void PlayListWidget::addSelected() { - + qDebug("addSelected"); switch (whichList()) { case 0: //playlist break; case 1: { //audio QListViewItemIterator it( audioView ); // iterate through all items of the listview @@ -554,12 +480,13 @@ void PlayListWidget::addSelected() { }; } void PlayListWidget::removeSelected() { d->selectedFiles->removeSelected( ); + writeCurrentM3u(); } void PlayListWidget::playIt( QListViewItem *it) { if(!it) return; mediaPlayerState->setPlaying(FALSE); @@ -567,27 +494,25 @@ void PlayListWidget::playIt( QListViewItem *it) { d->selectedFiles->unSelect(); } void PlayListWidget::addToSelection( QListViewItem *it) { d->setDocumentUsed = FALSE; - + qDebug("addToSelection2"); if(it) { switch ( whichList()) { case 1: { QListIterator<DocLnk> dit( files.children() ); for ( ; dit.current(); ++dit ) { if( dit.current()->name() == it->text(0)) { if(QFileInfo( dit.current()->file()).exists()) d->selectedFiles->addToSelection( **dit ); } } writeCurrentM3u(); - } - break; case 2: { QListIterator<DocLnk> dit( vFiles.children() ); for ( ; dit.current(); ++dit ) { if( dit.current()->name() == it->text(0)) { if( QFileInfo( dit.current()->file()).exists() ) @@ -777,102 +702,106 @@ void PlayListWidget::openFile() { QString filename, name; InputDialog *fileDlg; fileDlg = new InputDialog(this,tr("Open file or URL"),TRUE, 0); fileDlg->exec(); if( fileDlg->result() == 1 ) { filename = fileDlg->text(); - qDebug( "Selected filename is " + filename ); - - if(filename.left(4) == "http") { //if http, lets write a new m3u Om3u *m3uList; DocLnk lnk; - QString m3uFile, m3uFilePath; + Config cfg( "OpiePlayer" ); + cfg.setGroup("PlayList"); + if(filename.left(4) == "http") { + QString m3uFile, m3uFilePath; if(filename.find(":",8,TRUE) != -1) { //found a port m3uFile = filename.left( filename.find( ":",8,TRUE)); m3uFile = m3uFile.right( 7); } else if(filename.left(4) == "http"){ m3uFile=filename; m3uFile = m3uFile.right( m3uFile.length() - 7); } else{ m3uFile=filename; } -// qDebug( m3uFile); -//this is where this new m3u is going to live at - m3uFilePath = QDir::homeDirPath() + "/" + m3uFile + ".m3u"; -// m3uFile += ".m3u"; - m3uList = new Om3u( m3uFile+".m3u", IO_ReadWrite ); + qDebug("<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"+ m3uFile); + m3uList = new Om3u( cfg.readEntry("CurrentPlaylist",""), IO_Append | IO_ReadWrite ); m3uList->add( filename); m3uList->write(); + m3uList->close(); if(m3uList) delete m3uList; -// qDebug( m3uFile); - lnk.setName( filename ); //sets file name - lnk.setFile( m3uFilePath ); //sets File property - lnk.setType( MimeType( QFile::encodeName(m3uFilePath) ).id() ); - - lnk.setExec( "opieplayer2" ); - lnk.setIcon("opieplayer2/playlist2"); - - if( !lnk.writeLink() ) { - qDebug( "Writing doclink did not work" ); - } + lnk.setName( filename ); //sets name + lnk.setFile( filename ); //sets file name + lnk.setIcon("opieplayer2/musicfile"); d->selectedFiles->addToSelection( lnk ); - } else if( filename.right( 3 ) == "m3u" ) { readm3u( filename ); } else if( filename.right(3) == "pls" ) { readPls( filename ); } + else { + m3uList = new Om3u( cfg.readEntry("CurrentPlaylist",""), IO_Append | IO_ReadWrite ); + m3uList->add( filename); + m3uList->write(); + m3uList->close(); + if(m3uList) delete m3uList; + d->selectedFiles->addToSelection( DocLnk(filename) ); } + } + if( fileDlg ) { delete fileDlg; } } /* -reads m3u and adds files/urls to playlist */ +reads m3u and shows files/urls to playlist widget */ void PlayListWidget::readm3u( const QString &filename ) { qDebug( "read m3u filename " + filename ); Om3u *m3uList; QString s, name; m3uList = new Om3u( filename, IO_ReadOnly ); m3uList->readM3u(); DocLnk lnk; for ( QStringList::ConstIterator it = m3uList->begin(); it != m3uList->end(); ++it ) { s = *it; - s.replace( QRegExp( "%20" )," " ); +// s.replace( QRegExp( "%20" )," " ); // qDebug("reading "+ s); - + if(s.left(4)=="http") { + lnk.setName( s ); //sets file name + lnk.setFile( s ); //sets file name + lnk.setIcon("opieplayer2/musicfile"); + } + else { if( QFileInfo( s ).exists() ) { lnk.setName( QFileInfo(s).baseName()); // qDebug("set link "+s); if(s.at(s.length()-4) == '.') //if regular file lnk.setFile( s); else lnk.setFile( s+"/"); //if url with no extension - - d->selectedFiles->addToSelection( lnk ); } } + d->selectedFiles->addToSelection( lnk ); + } Config config( "OpiePlayer" ); config.setGroup( "PlayList" ); config.writeEntry("CurrentPlaylist",filename); config.write(); currentPlayList=filename; +// m3uList->write(); m3uList->close(); if(m3uList) delete m3uList; d->selectedFiles->setSelectedItem( s); - setCaption(tr("OpiePlayer: ")+ filename); + setCaption(tr("OpiePlayer: ")+ QFileInfo(filename).baseName()); } /* reads pls and adds files/urls to playlist */ void PlayListWidget::readPls( const QString &filename ) { @@ -923,21 +852,23 @@ void PlayListWidget::writeCurrentM3u() { qDebug("writting to current m3u"); Config cfg( "OpiePlayer" ); cfg.setGroup("PlayList"); QString currentPlaylist = cfg.readEntry("CurrentPlaylist",""); // int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 ); Om3u *m3uList; - m3uList = new Om3u( currentPlaylist, IO_ReadWrite ); + m3uList = new Om3u( currentPlaylist, IO_ReadWrite |IO_Truncate ); d->selectedFiles->first(); do { m3uList->add( d->selectedFiles->current()->file()); } while ( d->selectedFiles->next() ); // qDebug( list ); m3uList->write(); + m3uList->close(); + if(m3uList) delete m3uList; } /* writes current playlist to m3u file */ void PlayListWidget::writem3u() { @@ -966,12 +897,14 @@ void PlayListWidget::writem3u() { do { m3uList->add( d->selectedFiles->current()->file()); } while ( d->selectedFiles->next() ); // qDebug( list ); m3uList->write(); + m3uList->close(); + } if(m3uList) delete m3uList; if(fileDlg) delete fileDlg; DocLnk lnk; lnk.setFile( filename); diff --git a/noncore/multimedia/opieplayer2/playlistwidget.h b/noncore/multimedia/opieplayer2/playlistwidget.h index 8a77619..53be7a7 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.h +++ b/noncore/multimedia/opieplayer2/playlistwidget.h @@ -70,24 +70,23 @@ public: public slots: bool first(); bool last(); bool next(); bool prev(); - void writeConfig( Config& cfg ) const; + void writeDefaultPlaylist( ); QString currentFileListPathName(); protected: void keyReleaseEvent( QKeyEvent *e); private: int defaultSkinIndex; bool audioScan, videoScan; void readm3u(const QString &); void readPls(const QString &); void initializeStates(); - void readConfig( Config& cfg ); void populateAudioView(); void populateVideoView(); private slots: void populateSkinsMenu(); void skinsMenuActivated(int); |