author | sandman <sandman> | 2002-12-11 00:17:09 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-12-11 00:17:09 (UTC) |
commit | 6c71f5ccd9506234a317d9ff3d119613c457e769 (patch) (unidiff) | |
tree | f78a9d2a0981dbb446096bf072ca5decaa5e1d59 /core/multimedia/opieplayer/playlistwidget.cpp | |
parent | e9d1213578b83f8380c4681186246a2b32ae6375 (diff) | |
download | opie-6c71f5ccd9506234a317d9ff3d119613c457e769.zip opie-6c71f5ccd9506234a317d9ff3d119613c457e769.tar.gz opie-6c71f5ccd9506234a317d9ff3d119613c457e769.tar.bz2 |
fix for a stupid bug .. op1 wants to strip the extension, but instead
stripps everything after the first '.'. So filenames like
"02. foobar.mp3" become "02"
Diffstat (limited to 'core/multimedia/opieplayer/playlistwidget.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/multimedia/opieplayer/playlistwidget.cpp | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp index c28548c..8b25a4c 100644 --- a/core/multimedia/opieplayer/playlistwidget.cpp +++ b/core/multimedia/opieplayer/playlistwidget.cpp | |||
@@ -85,2 +85,9 @@ extern MediaPlayerState *mediaPlayerState; | |||
85 | 85 | ||
86 | static inline QString fullBaseName ( const QFileInfo &fi ) | ||
87 | { | ||
88 | QString str = fi. fileName ( ); | ||
89 | return str. left ( str. findRev ( '.' )); | ||
90 | } | ||
91 | |||
92 | |||
86 | QString audioMimes ="audio/mpeg;audio/x-wav;audio/x-ogg"; | 93 | QString audioMimes ="audio/mpeg;audio/x-wav;audio/x-ogg"; |
@@ -326,3 +333,3 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
326 | loadList(DocLnk( currentPlaylist)); | 333 | loadList(DocLnk( currentPlaylist)); |
327 | setCaption(tr("OpiePlayer: ")+ QFileInfo(currentPlaylist).baseName()); | 334 | setCaption(tr("OpiePlayer: ")+ fullBaseName ( QFileInfo(currentPlaylist))); |
328 | 335 | ||
@@ -683,3 +690,3 @@ void PlayListWidget::addSelected() { | |||
683 | }; | 690 | }; |
684 | lnk.setName( QFileInfo(filename).baseName() ); //sets name | 691 | lnk.setName( fullBaseName ( QFileInfo(filename))); //sets name |
685 | lnk.setFile( filename ); //sets file name | 692 | lnk.setFile( filename ); //sets file name |
@@ -718,3 +725,3 @@ void PlayListWidget::addToSelection( QListViewItem *it) { | |||
718 | filename=it->text(3); | 725 | filename=it->text(3); |
719 | lnk.setName( QFileInfo(filename).baseName() ); //sets name | 726 | lnk.setName( fullBaseName ( QFileInfo(filename)) ); //sets name |
720 | lnk.setFile( filename ); //sets file name | 727 | lnk.setFile( filename ); //sets file name |
@@ -1040,3 +1047,3 @@ void PlayListWidget::openFile() { | |||
1040 | } else { | 1047 | } else { |
1041 | lnk.setName( QFileInfo(filename).baseName() ); //sets name | 1048 | lnk.setName( fullBaseName ( QFileInfo(filename)) ); //sets name |
1042 | lnk.setFile( filename ); //sets file name | 1049 | lnk.setFile( filename ); //sets file name |
@@ -1076,3 +1083,3 @@ void PlayListWidget::readm3u( const QString &filename ) { | |||
1076 | // if( QFileInfo( s ).exists() ) { | 1083 | // if( QFileInfo( s ).exists() ) { |
1077 | lnk.setName( QFileInfo(s).baseName()); | 1084 | lnk.setName( fullBaseName ( QFileInfo(s))); |
1078 | // if(s.right(4) == '.') {//if regular file | 1085 | // if(s.right(4) == '.') {//if regular file |
@@ -1102,3 +1109,3 @@ void PlayListWidget::readm3u( const QString &filename ) { | |||
1102 | d->selectedFiles->setSelectedItem( s); | 1109 | d->selectedFiles->setSelectedItem( s); |
1103 | setCaption(tr("OpiePlayer: ")+ QFileInfo(filename).baseName()); | 1110 | setCaption(tr("OpiePlayer: ")+ fullBaseName ( QFileInfo(filename))); |
1104 | 1111 | ||
@@ -1121,3 +1128,3 @@ void PlayListWidget::readPls( const QString &filename ) { | |||
1121 | QFileInfo f( s ); | 1128 | QFileInfo f( s ); |
1122 | QString name = f.baseName(); | 1129 | QString name = fullBaseName ( f); |
1123 | 1130 | ||