author | sandman <sandman> | 2002-12-11 00:17:09 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-12-11 00:17:09 (UTC) |
commit | 6c71f5ccd9506234a317d9ff3d119613c457e769 (patch) (side-by-side diff) | |
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) (ignore 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; +static inline QString fullBaseName ( const QFileInfo &fi ) +{ + QString str = fi. fileName ( ); + return str. left ( str. findRev ( '.' )); +} + + QString audioMimes ="audio/mpeg;audio/x-wav;audio/x-ogg"; @@ -326,3 +333,3 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) loadList(DocLnk( currentPlaylist)); - setCaption(tr("OpiePlayer: ")+ QFileInfo(currentPlaylist).baseName()); + setCaption(tr("OpiePlayer: ")+ fullBaseName ( QFileInfo(currentPlaylist))); @@ -683,3 +690,3 @@ void PlayListWidget::addSelected() { }; - lnk.setName( QFileInfo(filename).baseName() ); //sets name + lnk.setName( fullBaseName ( QFileInfo(filename))); //sets name lnk.setFile( filename ); //sets file name @@ -718,3 +725,3 @@ void PlayListWidget::addToSelection( QListViewItem *it) { filename=it->text(3); - lnk.setName( QFileInfo(filename).baseName() ); //sets name + lnk.setName( fullBaseName ( QFileInfo(filename)) ); //sets name lnk.setFile( filename ); //sets file name @@ -1040,3 +1047,3 @@ void PlayListWidget::openFile() { } else { - lnk.setName( QFileInfo(filename).baseName() ); //sets name + lnk.setName( fullBaseName ( QFileInfo(filename)) ); //sets name lnk.setFile( filename ); //sets file name @@ -1076,3 +1083,3 @@ void PlayListWidget::readm3u( const QString &filename ) { // if( QFileInfo( s ).exists() ) { - lnk.setName( QFileInfo(s).baseName()); + lnk.setName( fullBaseName ( QFileInfo(s))); // if(s.right(4) == '.') {//if regular file @@ -1102,3 +1109,3 @@ void PlayListWidget::readm3u( const QString &filename ) { d->selectedFiles->setSelectedItem( s); - setCaption(tr("OpiePlayer: ")+ QFileInfo(filename).baseName()); + setCaption(tr("OpiePlayer: ")+ fullBaseName ( QFileInfo(filename))); @@ -1121,3 +1128,3 @@ void PlayListWidget::readPls( const QString &filename ) { QFileInfo f( s ); - QString name = f.baseName(); + QString name = fullBaseName ( f); |