author | llornkcor <llornkcor> | 2002-10-10 01:20:36 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-10-10 01:20:36 (UTC) |
commit | 2cbc91d6aff15c931426f3c835b5126c7da3ba2b (patch) (unidiff) | |
tree | 65d6cf3c96306ccbb55c44c5d21af3777835b134 /noncore | |
parent | 41aaa97e19b29f96fced9013a707cc6d16bc2143 (diff) | |
download | opie-2cbc91d6aff15c931426f3c835b5126c7da3ba2b.zip opie-2cbc91d6aff15c931426f3c835b5126c7da3ba2b.tar.gz opie-2cbc91d6aff15c931426f3c835b5126c7da3ba2b.tar.bz2 |
other crash fixes
-rw-r--r-- | noncore/multimedia/opieplayer2/om3u.cpp | 29 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 64 |
2 files changed, 47 insertions, 46 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 | |||
@@ -52,11 +52,5 @@ Om3u::Om3u( const QString &filePath, int mode) | |||
52 | : QStringList (){ | 52 | : QStringList (){ |
53 | //filePath is path name to m3u | ||
54 | //qDebug("<<<<<<<new m3u "+filePath); | 53 | //qDebug("<<<<<<<new m3u "+filePath); |
55 | f.setName(filePath); | 54 | f.setName(filePath); |
56 | // if(f.exists()) | 55 | f.open(mode); |
57 | // f.open( IO_ReadWrite); | ||
58 | // else | ||
59 | // f.open( IO_ReadWrite | IO_Truncate); | ||
60 | f.open(mode); | ||
61 | |||
62 | } | 56 | } |
@@ -133,8 +127,10 @@ void Om3u::readPls() { //it's a pls file | |||
133 | void Om3u::write() { //writes list to m3u file | 127 | void Om3u::write() { //writes list to m3u file |
134 | QString list; | 128 | QString list; |
129 | if(count()>0) { | ||
135 | for ( QStringList::ConstIterator it = begin(); it != end(); ++it ) { | 130 | for ( QStringList::ConstIterator it = begin(); it != end(); ++it ) { |
136 | qDebug(*it); | 131 | qDebug(*it); |
137 | list += *it+"\n"; | 132 | list += *it+"\n"; |
138 | } | 133 | } |
139 | f.writeBlock( list, list.length() ); | 134 | f.writeBlock( list, list.length() ); |
135 | } | ||
140 | // f.close(); | 136 | // f.close(); |
@@ -147,8 +143,9 @@ void Om3u::add(const QString &filePath) { //adds to m3u file | |||
147 | void Om3u::remove(const QString &filePath) { //removes from m3u list | 143 | void Om3u::remove(const QString &filePath) { //removes from m3u list |
148 | QString list, currentFile; | 144 | QString list, currentFile; |
145 | if(count()>0) { | ||
149 | for ( QStringList::ConstIterator it = begin(); it != end(); ++it ) { | 146 | for ( QStringList::ConstIterator it = begin(); it != end(); ++it ) { |
150 | currentFile=*it; | 147 | currentFile=*it; |
151 | // qDebug(*it); | 148 | // qDebug(*it); |
152 | 149 | ||
153 | if( filePath != currentFile) | 150 | if( filePath != currentFile) |
154 | list += currentFile+"\n"; | 151 | list += currentFile+"\n"; |
@@ -156,3 +153,3 @@ void Om3u::remove(const QString &filePath) { //removes from m3u list | |||
156 | f.writeBlock( list, list.length() ); | 153 | f.writeBlock( list, list.length() ); |
157 | 154 | } | |
158 | } | 155 | } |
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,9 +187,9 @@ void PlayListWidget::writeDefaultPlaylist() { | |||
187 | if( currentString == filename) { | 187 | if( currentString == filename) { |
188 | Om3u *m3uList; | 188 | Om3u *m3uList; |
189 | // qDebug("<<<<<<<<<<<<<default>>>>>>>>>>>>>>>>>>>"); | 189 | // qDebug("<<<<<<<<<<<<<default>>>>>>>>>>>>>>>>>>>"); |
190 | if( d->selectedFiles->first() ) { | ||
190 | m3uList = new Om3u(filename, IO_ReadWrite | IO_Truncate); | 191 | m3uList = new Om3u(filename, IO_ReadWrite | IO_Truncate); |
191 | d->selectedFiles->first(); | ||
192 | do { | 192 | do { |
193 | // qDebug(d->selectedFiles->current()->file()); | 193 | // qDebug(d->selectedFiles->current()->file()); |
194 | m3uList->add( d->selectedFiles->current()->file() ); | 194 | m3uList->add( d->selectedFiles->current()->file() ); |
195 | } | 195 | } |
@@ -200,2 +200,4 @@ void PlayListWidget::writeDefaultPlaylist() { | |||
200 | if(m3uList) delete m3uList; | 200 | if(m3uList) delete m3uList; |
201 | |||
202 | } | ||
201 | } | 203 | } |
@@ -855,5 +857,7 @@ void PlayListWidget::writeCurrentM3u() { | |||
855 | 857 | ||
858 | if( d->selectedFiles->first()) { | ||
856 | Om3u *m3uList; | 859 | Om3u *m3uList; |
857 | m3uList = new Om3u( currentPlaylist, IO_ReadWrite | IO_Truncate ); | 860 | m3uList = new Om3u( currentPlaylist, IO_ReadWrite | IO_Truncate ); |
858 | d->selectedFiles->first(); | 861 | |
862 | |||
859 | qDebug( d->selectedFiles->current()->file()); | 863 | qDebug( d->selectedFiles->current()->file()); |
@@ -869,2 +873,3 @@ void PlayListWidget::writeCurrentM3u() { | |||
869 | if(m3uList) delete m3uList; | 873 | if(m3uList) delete m3uList; |
874 | } | ||
870 | } | 875 | } |
@@ -892,36 +897,35 @@ void PlayListWidget::writem3u() { | |||
892 | 897 | ||
898 | if( d->selectedFiles->first()) { | ||
893 | m3uList = new Om3u(filename, IO_ReadWrite); | 899 | m3uList = new Om3u(filename, IO_ReadWrite); |
894 | |||
895 | d->selectedFiles->first(); | ||
896 | 900 | ||
897 | do { | 901 | do { |
898 | m3uList->add( d->selectedFiles->current()->file()); | 902 | m3uList->add( d->selectedFiles->current()->file()); |
899 | } | 903 | } |
900 | while ( d->selectedFiles->next() ); | 904 | while ( d->selectedFiles->next() ); |
901 | // qDebug( list ); | 905 | // qDebug( list ); |
902 | m3uList->write(); | 906 | m3uList->write(); |
903 | m3uList->close(); | 907 | m3uList->close(); |
904 | if(m3uList) delete m3uList; | 908 | if(m3uList) delete m3uList; |
905 | 909 | ||
906 | if(fileDlg) delete fileDlg; | 910 | if(fileDlg) delete fileDlg; |
907 | 911 | ||
908 | DocLnk lnk; | 912 | DocLnk lnk; |
909 | lnk.setFile( filename); | 913 | lnk.setFile( filename); |
910 | lnk.setIcon("opieplayer2/playlist2"); | 914 | lnk.setIcon("opieplayer2/playlist2"); |
911 | lnk.setName( name); //sets file name | 915 | lnk.setName( name); //sets file name |
912 | 916 | ||
913 | // qDebug(filename); | 917 | // qDebug(filename); |
914 | Config config( "OpiePlayer" ); | 918 | Config config( "OpiePlayer" ); |
915 | config.setGroup( "PlayList" ); | 919 | config.setGroup( "PlayList" ); |
916 | 920 | ||
917 | config.writeEntry("CurrentPlaylist",filename); | 921 | config.writeEntry("CurrentPlaylist",filename); |
918 | currentPlayList=filename; | 922 | currentPlayList=filename; |
919 | 923 | ||
920 | if(!lnk.writeLink()) { | 924 | if(!lnk.writeLink()) { |
921 | qDebug("Writing doclink did not work"); | 925 | qDebug("Writing doclink did not work"); |
922 | } | 926 | } |
923 | 927 | ||
924 | setCaption(tr("OpiePlayer: ") + name); | 928 | setCaption(tr("OpiePlayer: ") + name); |
929 | } | ||
925 | } | 930 | } |
926 | |||
927 | } | 931 | } |