summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/om3u.cpp11
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.cpp14
2 files changed, 13 insertions, 12 deletions
diff --git a/noncore/multimedia/opieplayer2/om3u.cpp b/noncore/multimedia/opieplayer2/om3u.cpp
index 0be727b..039f3b1 100644
--- a/noncore/multimedia/opieplayer2/om3u.cpp
+++ b/noncore/multimedia/opieplayer2/om3u.cpp
@@ -50,15 +50,9 @@
Om3u::Om3u( const QString &filePath, int mode)
: QStringList (){
-//filePath is path name to m3u
//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(){}
@@ -132,11 +126,13 @@ void Om3u::readPls() { //it's a pls file
void Om3u::write() { //writes list to m3u file
QString list;
+ if(count()>0) {
for ( QStringList::ConstIterator it = begin(); it != end(); ++it ) {
qDebug(*it);
list += *it+"\n";
}
f.writeBlock( list, list.length() );
+ }
// f.close();
}
@@ -146,6 +142,7 @@ void Om3u::add(const QString &filePath) { //adds to m3u file
void Om3u::remove(const QString &filePath) { //removes from m3u list
QString list, currentFile;
+ if(count()>0) {
for ( QStringList::ConstIterator it = begin(); it != end(); ++it ) {
currentFile=*it;
// qDebug(*it);
@@ -154,7 +151,7 @@ void Om3u::remove(const QString &filePath) { //removes from m3u list
list += currentFile+"\n";
}
f.writeBlock( list, list.length() );
-
+ }
}
void Om3u::deleteFile(const QString &filePath) {//deletes m3u file
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index e28efd0..f9192e8 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -187,8 +187,8 @@ void PlayListWidget::writeDefaultPlaylist() {
if( currentString == filename) {
Om3u *m3uList;
// qDebug("<<<<<<<<<<<<<default>>>>>>>>>>>>>>>>>>>");
+ if( d->selectedFiles->first() ) {
m3uList = new Om3u(filename, IO_ReadWrite | IO_Truncate);
- d->selectedFiles->first();
do {
// qDebug(d->selectedFiles->current()->file());
m3uList->add( d->selectedFiles->current()->file() );
@@ -198,6 +198,8 @@ void PlayListWidget::writeDefaultPlaylist() {
m3uList->write();
m3uList->close();
if(m3uList) delete m3uList;
+
+ }
}
}
@@ -853,9 +855,11 @@ void PlayListWidget::writeCurrentM3u() {
cfg.setGroup("PlayList");
QString currentPlaylist = cfg.readEntry("CurrentPlaylist","");
+ if( d->selectedFiles->first()) {
Om3u *m3uList;
m3uList = new Om3u( currentPlaylist, IO_ReadWrite | IO_Truncate );
- d->selectedFiles->first();
+
+
qDebug( d->selectedFiles->current()->file());
do {
qDebug( d->selectedFiles->current()->file());
@@ -868,6 +872,7 @@ void PlayListWidget::writeCurrentM3u() {
if(m3uList) delete m3uList;
}
+}
/*
writes current playlist to m3u file */
@@ -890,10 +895,9 @@ void PlayListWidget::writem3u() {
filename = QPEApplication::documentDir() + "/" +name+".m3u";
}
+ if( d->selectedFiles->first()) {
m3uList = new Om3u(filename, IO_ReadWrite);
- d->selectedFiles->first();
-
do {
m3uList->add( d->selectedFiles->current()->file());
}
@@ -923,7 +927,7 @@ void PlayListWidget::writem3u() {
setCaption(tr("OpiePlayer: ") + name);
}
-
+ }
}
void PlayListWidget::keyReleaseEvent( QKeyEvent *e ) {