Merge from BRANCH_1_0

1 files changed, 7 insertions, 16 deletions

diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 5f750ba..a1a1016 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -22,49 +22,38 @@
 ..}^=.=       =       ;      General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
-#include <qpe/qpetoolbar.h>
-#include <qpe/qpeapplication.h>
-#include <qpe/storage.h>
-#include <qpe/mimetype.h>
-#include <qpe/global.h>
-#include <qpe/resource.h>
-#include <qpe/config.h>
+#include <qtoolbar.h>
 
 #include <opie/ofiledialog.h>
 
-#include <qdatetime.h>
-#include <qdir.h>
 #include <qmessagebox.h>
-#include <qregexp.h>
-#include <qtextstream.h>
 
 #include "playlistselection.h"
 #include "playlistwidget.h"
 #include "mediaplayerstate.h"
 #include "inputDialog.h"
 #include "om3u.h"
 #include "playlistfileview.h"
 
 //only needed for the random play
-#include <stdlib.h>
 #include <assert.h>
 
 PlayListWidget::PlayListWidget( MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name )
     : PlayListWidgetGui( mediaPlayerState, parent, name ) , currentFileListView( 0 )
 {
 
     d->tbAddToList =  new ToolButton( bar, tr( "Add to Playlist" ),
                                       "opieplayer2/add_to_playlist",
                                       this , SLOT(addSelected() ) );
     d->tbRemoveFromList = new ToolButton( bar, tr( "Remove from Playlist" ),
                                           "opieplayer2/remove_from_playlist",
                                           this , SLOT(removeSelected() ) );
@@ -658,48 +647,50 @@ void PlayListWidget::openURL() {
 
 
 void PlayListWidget::openFile() {
 
     QString filename, name;
 
     Config cfg( "OpiePlayer" );
     cfg.setGroup("Dialog");
     MimeTypes types;
     QStringList audio, video, all;
     audio << "audio/*";
     audio << "playlist/plain";
+    audio << "application/ogg";
     audio << "audio/x-mpegurl";
 
     video << "video/*";
     video << "playlist/plain";
 
     all += audio;
     all += video;
     types.insert("All Media Files", all );
     types.insert("Audio",  audio );
     types.insert("Video", video );
 
     QString str = OFileDialog::getOpenFileName( 1,
                   cfg.readEntry("LastDirectory",QPEApplication::documentDir()),"",
                   types, 0 );
-    if(str.left(2) == "//") str=str.right(str.length()-1);
-    cfg.writeEntry("LastDirectory" ,QFileInfo(str).dirPath());
 
+    if(str.left(2) == "//")  {
+        str=str.right(str.length()-1);
+    }
+    cfg.writeEntry( "LastDirectory" ,QFileInfo( str ).dirPath() );
 
     if( !str.isEmpty() ) {
+
         qDebug( "Selected filename is " + str );
         filename = str;
         DocLnk lnk;
-        Config cfg( "OpiePlayer" );
-        cfg.setGroup("PlayList");
 
         if( filename.right( 3) == "m3u" ||  filename.right(3) == "pls" ) {
             readListFromFile( filename );
         } else {
             lnk.setName( QFileInfo(filename).baseName() ); //sets name
             lnk.setFile( filename ); //sets file name
             d->selectedFiles->addToSelection(  lnk);
             writeCurrentM3u();
             d->selectedFiles->setSelectedItem( lnk.name());
         }
     }
 }