summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayer.cpp2
-rw-r--r--noncore/multimedia/opieplayer2/om3u.cpp25
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.cpp175
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.h3
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
@@ -330,17 +330,17 @@ void MediaPlayer::keyReleaseEvent( QKeyEvent *e) {
// mediaPlayerState->toggleBlank();
break;
case Key_F13: //mail
qDebug("Blank here");
// mediaPlayerState->toggleBlank();
break;
}
}
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
@@ -54,48 +54,48 @@ Om3u::Om3u( const QString &filePath, int mode)
//qDebug("<<<<<<<new m3u "+filePath);
f.setName(filePath);
// if(f.exists())
// f.open( IO_ReadWrite);
// else
// f.open( IO_ReadWrite | IO_Truncate);
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);
}
}
}
}
void Om3u::readPls() { //it's a pls file
QTextStream t( &f );
QString s;
while ( !t.atEnd() ) {
s = t.readLine();
@@ -128,30 +128,41 @@ void Om3u::readPls() { //it's a pls file
}
}
}
}
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
@@ -167,119 +167,45 @@ PlayListWidget::~PlayListWidget() {
}
delete d;
}
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() ||
lnk.file().left(4) == "http" )
d->selectedFiles->addToSelection( lnk );
writeCurrentM3u();
}
else
mediaPlayerState->setPlaying( TRUE );
@@ -351,42 +277,42 @@ void PlayListWidget::addAllMusicToList() {
void PlayListWidget::addAllVideoToList() {
QListIterator<DocLnk> dit( vFiles.children() );
for ( ; dit.current(); ++dit ) {
if( QFileInfo( dit.current()->file() ).exists() ) {
d->selectedFiles->addToSelection( **dit );
}
}
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 );
}
}
void PlayListWidget::useSelectedDocument() {
d->setDocumentUsed = FALSE;
}
@@ -498,25 +424,25 @@ void PlayListWidget::loadList( const DocLnk & lnk) {
void PlayListWidget::setPlaylist( bool shown ) {
if ( shown ) {
d->playListFrame->show();
} else {
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
for ( ; it.current(); ++it ) {
if ( it.current()->isSelected() ) {
QListIterator<DocLnk> dit( files.children() );
for ( ; dit.current(); ++dit ) {
if( dit.current()->name() == it.current()->text(0) ) {
if( QFileInfo( dit.current()->file()).exists()) {
@@ -548,52 +474,51 @@ void PlayListWidget::addSelected() {
}
}
tabWidget->setCurrentPage(0);
writeCurrentM3u();
}
break;
};
}
void PlayListWidget::removeSelected() {
d->selectedFiles->removeSelected( );
+ writeCurrentM3u();
}
void PlayListWidget::playIt( QListViewItem *it) {
if(!it) return;
mediaPlayerState->setPlaying(FALSE);
mediaPlayerState->setPlaying(TRUE);
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() )
d->selectedFiles->addToSelection( **dit );
}
}
writeCurrentM3u();
}
@@ -771,114 +696,118 @@ void PlayListWidget::populateVideoView() {
}
}
}
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 ) {
qDebug( "pls filename is " + filename );
Om3u *m3uList;
QString s, name;
m3uList = new Om3u( filename, IO_ReadOnly );
m3uList->readPls();
@@ -917,33 +846,35 @@ void PlayListWidget::readPls( const QString &filename ) {
if(m3uList) delete m3uList;
}
/*
writes current playlist to current m3u file */
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() {
InputDialog *fileDlg;
fileDlg = new InputDialog( this, tr( "Save m3u Playlist " ), TRUE, 0);
fileDlg->exec();
QString name, filename, list;
Om3u *m3uList;
@@ -960,24 +891,26 @@ void PlayListWidget::writem3u() {
}
m3uList = new Om3u(filename, IO_ReadWrite);
d->selectedFiles->first();
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);
lnk.setIcon("opieplayer2/playlist2");
lnk.setName( name); //sets file name
// qDebug(filename);
Config config( "OpiePlayer" );
config.setGroup( "PlayList" );
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
@@ -64,36 +64,35 @@ public:
QString setDocFileRef, currentPlayList;
// retrieve the current playlist entry (media file link)
const DocLnk *current();
void useSelectedDocument();
int selected;
int whichList();
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);
void pmViewActivated(int);
void writem3u();
void writeCurrentM3u();
void scanForAudio();
void scanForVideo();
void openFile();