summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/multimedia/opieplayer/playlistwidget.cpp479
-rw-r--r--core/multimedia/opieplayer/playlistwidget.h2
2 files changed, 256 insertions, 225 deletions
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index eeaed33..ae25fe3 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -102,10 +102,10 @@ public:
ToolButton( QWidget *parent, const char *name, const QString& icon, QObject *handler, const QString& slot, bool t = FALSE )
- : QToolButton( parent, name ) {
- setTextLabel( name );
- setPixmap( Resource::loadPixmap( icon ) );
- setAutoRaise( TRUE );
- setFocusPolicy( QWidget::NoFocus );
- setToggleButton( t );
- connect( this, t ? SIGNAL( toggled(bool) ) : SIGNAL( clicked() ), handler, slot );
- QPEMenuToolFocusManager::manager()->addWidget( this );
+ : QToolButton( parent, name ) {
+ setTextLabel( name );
+ setPixmap( Resource::loadPixmap( icon ) );
+ setAutoRaise( TRUE );
+ setFocusPolicy( QWidget::NoFocus );
+ setToggleButton( t );
+ connect( this, t ? SIGNAL( toggled(bool) ) : SIGNAL( clicked() ), handler, slot );
+ QPEMenuToolFocusManager::manager()->addWidget( this );
}
@@ -117,5 +117,5 @@ public:
MenuItem( QWidget *parent, const QString& text, QObject *handler, const QString& slot )
- : QAction( text, QString::null, 0, 0 ) {
- connect( this, SIGNAL( activated() ), handler, slot );
- addTo( parent );
+ : QAction( text, QString::null, 0, 0 ) {
+ connect( this, SIGNAL( activated() ), handler, slot );
+ addTo( parent );
}
@@ -125,3 +125,3 @@ public:
PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
- : QMainWindow( parent, name, fl ) {
+ : QMainWindow( parent, name, fl ) {
@@ -144,3 +144,3 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
- // Create Toolbar
+ // Create Toolbar
QPEToolBar *toolbar = new QPEToolBar( this );
@@ -148,3 +148,3 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
- // Create Menubar
+ // Create Menubar
QPEMenuBar *menu = new QPEMenuBar( toolbar );
@@ -179,4 +179,5 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
new MenuItem( pmPlayList, tr( "Add all files" ), this, SLOT( addAllToList() ) );
-// pmPlayList->insertSeparator(-1);
+ pmPlayList->insertSeparator(-1);
new MenuItem( pmPlayList, tr( "Save PlayList" ), this, SLOT( saveList() ) );
+ new MenuItem( pmPlayList, tr( "Export playlist to m3u" ), this, SLOT(writem3u() ) );
pmPlayList->insertSeparator(-1);
@@ -210,3 +211,3 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
- // Add the playlist area
+ // Add the playlist area
@@ -225,7 +226,7 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
- QVBox *stretch1 = new QVBox( vbox1 ); stretch1->setBackgroundMode( PaletteButton ); // add stretch
- new ToolButton( vbox1, tr( "Move Up" ), "opieplayer/up", d->selectedFiles, SLOT(moveSelectedUp()) );
- new ToolButton( vbox1, tr( "Remove" ), "opieplayer/cut", d->selectedFiles, SLOT(removeSelected()) );
- new ToolButton( vbox1, tr( "Move Down" ), "opieplayer/down", d->selectedFiles, SLOT(moveSelectedDown()) );
- QVBox *stretch2 = new QVBox( vbox1 ); stretch2->setBackgroundMode( PaletteButton ); // add stretch
+ QVBox *stretch1 = new QVBox( vbox1 ); stretch1->setBackgroundMode( PaletteButton ); // add stretch
+ new ToolButton( vbox1, tr( "Move Up" ), "opieplayer/up", d->selectedFiles, SLOT(moveSelectedUp()) );
+ new ToolButton( vbox1, tr( "Remove" ), "opieplayer/cut", d->selectedFiles, SLOT(removeSelected()) );
+ new ToolButton( vbox1, tr( "Move Down" ), "opieplayer/down", d->selectedFiles, SLOT(moveSelectedDown()) );
+ QVBox *stretch2 = new QVBox( vbox1 ); stretch2->setBackgroundMode( PaletteButton ); // add stretch
@@ -295,3 +296,3 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
connect( d->selectedFiles, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
- this,SLOT( playlistViewPressed(int, QListViewItem *, const QPoint&, int)) );
+ this,SLOT( playlistViewPressed(int, QListViewItem *, const QPoint&, int)) );
@@ -308,3 +309,3 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
this,SLOT( playIt( QListViewItem *)) );
- connect( videoView, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) );
+ connect( videoView, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) );
@@ -313,10 +314,10 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
- connect( tabWidget, SIGNAL (currentChanged(QWidget*)),this,SLOT(tabChanged(QWidget*)));
+ connect( tabWidget, SIGNAL (currentChanged(QWidget*)),this,SLOT(tabChanged(QWidget*)));
- connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), d->tbPlay, SLOT( setOn( bool ) ) );
- connect( mediaPlayerState, SIGNAL( loopingToggled( bool ) ), d->tbLoop, SLOT( setOn( bool ) ) );
- connect( mediaPlayerState, SIGNAL( shuffledToggled( bool ) ), d->tbShuffle, SLOT( setOn( bool ) ) );
- connect( mediaPlayerState, SIGNAL( playlistToggled( bool ) ), this, SLOT( setPlaylist( bool ) ) );
+ connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), d->tbPlay, SLOT( setOn( bool ) ) );
+ connect( mediaPlayerState, SIGNAL( loopingToggled( bool ) ), d->tbLoop, SLOT( setOn( bool ) ) );
+ connect( mediaPlayerState, SIGNAL( shuffledToggled( bool ) ), d->tbShuffle, SLOT( setOn( bool ) ) );
+ connect( mediaPlayerState, SIGNAL( playlistToggled( bool ) ), this, SLOT( setPlaylist( bool ) ) );
- connect( d->selectedFiles, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( playIt( QListViewItem *) ) );
+ connect( d->selectedFiles, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( playIt( QListViewItem *) ) );
// connect( d->selectedFiles, SIGNAL( fileSelected( const DocLnk & ) ), this, SLOT( addToSelection( const DocLnk & ) ) );
@@ -342,3 +343,3 @@ PlayListWidget::~PlayListWidget() {
if ( d->current )
- delete d->current;
+ delete d->current;
delete d;
@@ -356,3 +357,3 @@ void PlayListWidget::initializeStates() {
// setPlaylist( mediaPlayerState->playlist() );
- setPlaylist( true);
+ setPlaylist( true);
// d->selectedFiles->first();
@@ -375,3 +376,3 @@ void PlayListWidget::readConfig( Config& cfg ) {
}
- d->selectedFiles->setSelectedItem( currentString);
+ d->selectedFiles->setSelectedItem( currentString);
// d->selectedFiles->setSelectedItem( (const QString &)currentString);
@@ -436,3 +437,3 @@ void PlayListWidget::clearList() {
while ( first() )
- d->selectedFiles->removeSelected();
+ d->selectedFiles->removeSelected();
}
@@ -454,3 +455,3 @@ void PlayListWidget::addAllMusicToList() {
if(QFileInfo(dit.current()->file()).exists())
- d->selectedFiles->addToSelection( **dit );
+ d->selectedFiles->addToSelection( **dit );
}
@@ -474,8 +475,8 @@ void PlayListWidget::setDocument(const QString& fileref) {
// qDebug("setDocument "+fileref);
- if(fileref.find("m3u",0,TRUE) != -1) { //is m3u
- readm3u( fileref);
- }
- else if(fileref.find("pls",0,TRUE) != -1) { //is pls
- readPls( fileref);
- }
+ if(fileref.find("m3u",0,TRUE) != -1) { //is m3u
+ readm3u( fileref);
+ }
+ else if(fileref.find("pls",0,TRUE) != -1) { //is pls
+ readPls( fileref);
+ }
else if(fileref.find("playlist",0,TRUE) != -1) {//is playlist
@@ -498,3 +499,3 @@ void PlayListWidget::setDocument(const QString& fileref) {
void PlayListWidget::setActiveWindow() {
- // When we get raised we need to ensure that it switches views
+ // When we get raised we need to ensure that it switches views
char origView = mediaPlayerState->view();
@@ -641,4 +642,4 @@ void PlayListWidget::saveList() {
if( fileDlg->result() == 1 ) {
- if ( d->current )
- delete d->current;
+ if ( d->current )
+ delete d->current;
filename = fileDlg->LineEdit1->text();//+".playlist";
@@ -657,9 +658,9 @@ void PlayListWidget::saveList() {
qDebug("Writing doclink did not work");
- }
- Config config( "OpiePlayer" );
- config.writeEntry("CurrentPlaylist",filename);
- setCaption(tr("OpiePlayer: ")+filename);
- d->selectedFiles->first();
- if(fileDlg)
- delete fileDlg;
+ }
+ Config config( "OpiePlayer" );
+ config.writeEntry("CurrentPlaylist",filename);
+ setCaption(tr("OpiePlayer: ")+filename);
+ d->selectedFiles->first();
+ if(fileDlg)
+ delete fileDlg;
}
@@ -687,5 +688,5 @@ void PlayListWidget::setPlaylist( bool shown ) {
if ( shown )
- d->playListFrame->show();
+ d->playListFrame->show();
else
- d->playListFrame->hide();
+ d->playListFrame->hide();
}
@@ -694,5 +695,5 @@ void PlayListWidget::setView( char view ) {
if ( view == 'l' )
- showMaximized();
+ showMaximized();
else
- hide();
+ hide();
}
@@ -701,11 +702,11 @@ void PlayListWidget::addSelected() {
- Config cfg( "OpiePlayer" );
- cfg.setGroup("PlayList");
- QString currentPlaylist = cfg.readEntry("CurrentPlaylist","");
- int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 );
+ Config cfg( "OpiePlayer" );
+ cfg.setGroup("PlayList");
+ QString currentPlaylist = cfg.readEntry("CurrentPlaylist","");
+ int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 );
- switch (tabWidget->currentPageIndex()) {
- case 0: //playlist
- break;
- case 1: { //audio
+ switch (tabWidget->currentPageIndex()) {
+ case 0: //playlist
+ break;
+ case 1: { //audio
// QString entryName;
@@ -713,33 +714,33 @@ void PlayListWidget::addSelected() {
// QString linkFile = cfg.readEntry( entryName );
- QListViewItemIterator it( audioView );
- // iterate through all items of the listview
- for ( ; it.current(); ++it ) {
- if ( it.current()->isSelected() ) {
- QListIterator<DocLnk> dit( files.children() );
- for ( ; dit.current(); ++dit ) {
- if( dit.current()->name() == it.current()->text(0) ) {
- d->selectedFiles->addToSelection( **dit );
- }
- }
- audioView->setSelected( it.current(),FALSE);
- }
- }
- tabWidget->setCurrentPage(0);
- }
- break;
- case 2: { // video
- QListViewItemIterator it( videoView );
- // iterate through all items of the listview
- for ( ; it.current(); ++it ) {
- if ( it.current()->isSelected() ) {
- QListIterator<DocLnk> dit( vFiles.children() );
- for ( ; dit.current(); ++dit ) {
- if( dit.current()->name() == it.current()->text(0) ) {
- d->selectedFiles->addToSelection( **dit );
- }
- }
+ QListViewItemIterator it( audioView );
+ // iterate through all items of the listview
+ for ( ; it.current(); ++it ) {
+ if ( it.current()->isSelected() ) {
+ QListIterator<DocLnk> dit( files.children() );
+ for ( ; dit.current(); ++dit ) {
+ if( dit.current()->name() == it.current()->text(0) ) {
+ d->selectedFiles->addToSelection( **dit );
+ }
+ }
+ audioView->setSelected( it.current(),FALSE);
+ }
+ }
+ tabWidget->setCurrentPage(0);
+ }
+ break;
+ case 2: { // video
+ QListViewItemIterator it( videoView );
+ // iterate through all items of the listview
+ for ( ; it.current(); ++it ) {
+ if ( it.current()->isSelected() ) {
+ QListIterator<DocLnk> dit( vFiles.children() );
+ for ( ; dit.current(); ++dit ) {
+ if( dit.current()->name() == it.current()->text(0) ) {
+ d->selectedFiles->addToSelection( **dit );
+ }
+ }
- videoView->setSelected( it.current(),FALSE);
- }
- }
+ videoView->setSelected( it.current(),FALSE);
+ }
+ }
// for ( int i = 0; i < noOfFiles; i++ ) {
@@ -757,6 +758,6 @@ void PlayListWidget::addSelected() {
// addToSelection( videoView->selectedItem() );
- tabWidget->setCurrentPage(0);
- }
- break;
- };
+ tabWidget->setCurrentPage(0);
+ }
+ break;
+ };
}
@@ -770,6 +771,6 @@ void PlayListWidget::playIt( QListViewItem *it) {
// mediaPlayerState->curPosition =0;
- qDebug("playIt");
+ qDebug("playIt");
mediaPlayerState->setPlaying(FALSE);
- mediaPlayerState->setPlaying(TRUE);
- d->selectedFiles->unSelect();
+ mediaPlayerState->setPlaying(TRUE);
+ d->selectedFiles->unSelect();
}
@@ -789,3 +790,3 @@ void PlayListWidget::addToSelection( QListViewItem *it) {
}
- break;
+ break;
case 2: {
@@ -798,3 +799,3 @@ void PlayListWidget::addToSelection( QListViewItem *it) {
}
- break;
+ break;
case 0:
@@ -854,11 +855,9 @@ void PlayListWidget::btnPlay(bool b) {
{
- qDebug("here we are");
- if( d->selectedFiles->current()->file().find(" ",0,TRUE) != -1
- || d->selectedFiles->current()->file().find("%20",0,TRUE) != -1) {
- QMessageBox::message("Note","You are trying to play\na malformed url.");
-
- } else {
-
+// if( d->selectedFiles->current()->file().find(" ",0,TRUE) != -1
+// if( d->selectedFiles->current()->file().find("%20",0,TRUE) != -1) {
+ QMessageBox::message("Note","You are trying to play\na malformed url.");
+// } else {
mediaPlayerState->setPlaying(b);
- } }
+// }
+ }
break;
@@ -866,9 +865,9 @@ void PlayListWidget::btnPlay(bool b) {
{
- addToSelection( audioView->currentItem() );
- mediaPlayerState->setPlaying(b);
- d->selectedFiles->removeSelected( );
- tabWidget->setCurrentPage(1);
- d->selectedFiles->unSelect();
- insanityBool=FALSE;
- }// audioView->clearSelection();
+ addToSelection( audioView->currentItem() );
+ mediaPlayerState->setPlaying(b);
+ d->selectedFiles->removeSelected( );
+ tabWidget->setCurrentPage(1);
+ d->selectedFiles->unSelect();
+ insanityBool=FALSE;
+ }// audioView->clearSelection();
break;
@@ -876,10 +875,10 @@ void PlayListWidget::btnPlay(bool b) {
{
- addToSelection( videoView->currentItem() );
- mediaPlayerState->setPlaying(b);
- qApp->processEvents();
- d->selectedFiles->removeSelected( );
- tabWidget->setCurrentPage(2);
- d->selectedFiles->unSelect();
- insanityBool=FALSE;
- }// videoView->clearSelection();
+ addToSelection( videoView->currentItem() );
+ mediaPlayerState->setPlaying(b);
+ qApp->processEvents();
+ d->selectedFiles->removeSelected( );
+ tabWidget->setCurrentPage(2);
+ d->selectedFiles->unSelect();
+ insanityBool=FALSE;
+ }// videoView->clearSelection();
break;
@@ -893,9 +892,9 @@ void PlayListWidget::deletePlaylist() {
(tr("Yes")), (tr("No")), 0 )){
- case 0: // Yes clicked,
- QFile().remove(playLists->selected()->file());
- QFile().remove(playLists->selected()->linkFile());
- playLists->reread();
- break;
- case 1: // Cancel
- break;
+ case 0: // Yes clicked,
+ QFile().remove(playLists->selected()->file());
+ QFile().remove(playLists->selected()->linkFile());
+ playLists->reread();
+ break;
+ case 1: // Cancel
+ break;
};
@@ -919,3 +918,3 @@ void PlayListWidget::viewPressed( int mouse, QListViewItem *item, const QPoint&
}
- break;
+ break;
};
@@ -931,3 +930,3 @@ void PlayListWidget::playlistViewPressed( int mouse, QListViewItem *item, const
{
- switch (mouse) {
+ switch (mouse) {
case 1:
@@ -936,10 +935,10 @@ void PlayListWidget::playlistViewPressed( int mouse, QListViewItem *item, const
case 2:{
- QPopupMenu m;
- m.insertItem( tr( "Play Selected" ), this, SLOT( playSelected() ));
- m.insertItem( tr( "Remove" ), this, SLOT( removeSelected() ));
+ QPopupMenu m;
+ m.insertItem( tr( "Play Selected" ), this, SLOT( playSelected() ));
+ m.insertItem( tr( "Remove" ), this, SLOT( removeSelected() ));
// m.insertSeparator();
// m.insertItem( tr( "Properties" ), this, SLOT( listDelete() ));
- m.exec( QCursor::pos() );
+ m.exec( QCursor::pos() );
}
- break;
+ break;
};
@@ -949,7 +948,7 @@ void PlayListWidget::playlistViewPressed( int mouse, QListViewItem *item, const
void PlayListWidget::listDelete() {
- Config cfg( "OpiePlayer" );
- cfg.setGroup("PlayList");
- QString currentPlaylist = cfg.readEntry("CurrentPlaylist","");
- QString file;
- int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 );
+ Config cfg( "OpiePlayer" );
+ cfg.setGroup("PlayList");
+ QString currentPlaylist = cfg.readEntry("CurrentPlaylist","");
+ QString file;
+ int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 );
switch ( tabWidget->currentPageIndex()) {
@@ -972,3 +971,3 @@ void PlayListWidget::listDelete() {
}
- populateAudioView();
+ populateAudioView();
}
@@ -991,3 +990,3 @@ void PlayListWidget::listDelete() {
}
- break;
+ break;
};
@@ -1083,30 +1082,30 @@ void PlayListWidget::openFile() {
if(filename.find(" ",0,TRUE) != -1 || filename.find("%20",0,TRUE) != -1) {
- QMessageBox::message("Note","Spaces in urls are not allowed.");
- return;
- } else {
- qDebug("Selected filename is "+filename);
- if(filename.right(3) == "m3u")
- readm3u( filename);
- else if(filename.right(3) == "pls")
- readPls( filename);
- else {
- DocLnk lnk;
-
- lnk.setName(filename); //sets file name
- if(filename.right(1) != "/" && filename.right(3) != "mp3" && filename.right(3) != "MP3")
- filename += "/";
- lnk.setFile(filename); //sets File property
-
- lnk.setType("audio/x-mpegurl");
- lnk.setExec("opieplayer");
- lnk.setIcon("opieplayer/MPEGPlayer");
-
- if(!lnk.writeLink())
- qDebug("Writing doclink did not work");
- d->selectedFiles->addToSelection( lnk);
+ QMessageBox::message("Note","Spaces in urls are not allowed.");
+ return;
+ } else {
+ qDebug("Selected filename is "+filename);
+ if(filename.right(3) == "m3u")
+ readm3u( filename);
+ else if(filename.right(3) == "pls")
+ readPls( filename);
+ else {
+ DocLnk lnk;
+
+ lnk.setName(filename); //sets file name
+ if(filename.right(1) != "/" && filename.right(3) != "mp3" && filename.right(3) != "MP3")
+ filename += "/";
+ lnk.setFile(filename); //sets File property
+
+ lnk.setType("audio/x-mpegurl");
+ lnk.setExec("opieplayer");
+ lnk.setIcon("opieplayer/MPEGPlayer");
+
+ if(!lnk.writeLink())
+ qDebug("Writing doclink did not work");
+ d->selectedFiles->addToSelection( lnk);
// if(fileDlg2)
// delete fileDlg2;
+ }
}
}
- }
if(fileDlg)
@@ -1189,8 +1188,8 @@ void PlayListWidget::keyPressEvent( QKeyEvent *e)
void PlayListWidget::doBlank() {
- qDebug("do blanking");
+ qDebug("do blanking");
fd=open("/dev/fb0",O_RDWR);
- if (fd != -1) {
- ioctl(fd,FBIOBLANK,1);
+ if (fd != -1) {
+ ioctl(fd,FBIOBLANK,1);
// close(fd);
- }
+ }
}
@@ -1201,9 +1200,9 @@ void PlayListWidget::doUnblank() {
// fd=open("/dev/fb0",O_RDWR);
- qDebug("do unblanking");
- if (fd != -1) {
- ioctl(fd,FBIOBLANK,0);
- close(fd);
- }
- QCopEnvelope h("QPE/System", "setBacklight(int)");
- h <<-3;// v[1]; // -3 Force on
+ qDebug("do unblanking");
+ if (fd != -1) {
+ ioctl(fd,FBIOBLANK,0);
+ close(fd);
+ }
+ QCopEnvelope h("QPE/System", "setBacklight(int)");
+ h <<-3;// v[1]; // -3 Force on
}
@@ -1222,7 +1221,7 @@ void PlayListWidget::readm3u(const QString &filename) {
s=t.readLine();
- if(s.find(" ",0,TRUE) != -1 || s.find("%20",0,TRUE) != -1) {
- QMessageBox::message("Note","Spaces in urls are not allowed.");
- }
- else if(s.find("#",0,TRUE) == -1) {
- if(s.find(" ",0,TRUE) == -1) { // not sure if this is neede since cf uses vfat
+ if(s.find(" ",0,TRUE) != -1 || s.find("%20",0,TRUE) != -1) {
+ QMessageBox::message("Note","Spaces in urls are not allowed.");
+ }
+ else if(s.find("#",0,TRUE) == -1) {
+ if(s.find(" ",0,TRUE) == -1) { // not sure if this is neede since cf uses vfat
if(s.left(2) == "E:" || s.left(2) == "P:") {
@@ -1239,3 +1238,3 @@ void PlayListWidget::readm3u(const QString &filename) {
qDebug("add "+name);
- d->selectedFiles->addToSelection( lnk);
+ d->selectedFiles->addToSelection( lnk);
} else { // is url
@@ -1243,17 +1242,17 @@ void PlayListWidget::readm3u(const QString &filename) {
s.replace(QRegExp("%20")," ");
- DocLnk lnk( s);
- QString name;
- if(name.left(4)=="http")
- name = s.right( s.length() - 7);
- else
- name=s;
+ DocLnk lnk( s);
+ QString name;
+ if(name.left(4)=="http")
+ name = s.right( s.length() - 7);
+ else
+ name=s;
// name = name.right(name.length()-name.findRev("\\",-1,TRUE)-1);
- lnk.setName(name);
- if(s.at(s.length()-4) == '.')
- lnk.setFile( s);
- else
- lnk.setFile( s+"/");
+ lnk.setName(name);
+ if(s.at(s.length()-4) == '.')
+ lnk.setFile( s);
+ else
+ lnk.setFile( s+"/");
// lnk.setFile( filename);
// lnk.setComment( s+"/");
- lnk.setType("audio/x-mpegurl");
+ lnk.setType("audio/x-mpegurl");
lnk.writeLink();
@@ -1261,6 +1260,6 @@ void PlayListWidget::readm3u(const QString &filename) {
// qDebug("add "+s);
- d->selectedFiles->addToSelection( lnk);
+ d->selectedFiles->addToSelection( lnk);
}
i++;
- }
+ }
}
@@ -1271,4 +1270,32 @@ void PlayListWidget::readm3u(const QString &filename) {
-void PlayListWidget::writem3u(const QString &filename) {
+void PlayListWidget::writem3u() {
+ InputDialog *fileDlg;
+ fileDlg = new InputDialog(this,tr("Save m3u Playlist "),TRUE, 0);
+ fileDlg->exec();
+ QString filename,list;
+ if( fileDlg->result() == 1 ) {
+ filename = fileDlg->LineEdit1->text();
+ qDebug(filename);
+ int noOfFiles = 0;
+ d->selectedFiles->first();
+ do {
+// we dont check for existance because of url's
+// qDebug(d->selectedFiles->current()->file());
+ list += d->selectedFiles->current()->file()+"\n";
+ noOfFiles++;
+ }
+ while ( d->selectedFiles->next() );
+ qDebug(list);
+ if(filename.left(1) != "/")
+ filename=QPEApplication::documentDir()+"/"+filename;
+ if(filename.right(3) != "m3u")
+ filename=filename+".m3u";
+
+ QFile f(filename);
+ f.open(IO_WriteOnly);
+ f.writeBlock(list, list.length());
+ f.close();
+ }
+ if(fileDlg) delete fileDlg;
}
@@ -1284,11 +1311,11 @@ void PlayListWidget::readPls(const QString &filename) {
int i=0;
- while ( !t.atEnd()) {
- s=t.readLine();
- if(s.left(4) == "File") {
- s=s.right(s.length() - 6);
- s.replace(QRegExp("%20")," ");
- qDebug("adding "+s+" to playlist");
+ while ( !t.atEnd()) {
+ s=t.readLine();
+ if(s.left(4) == "File") {
+ s=s.right(s.length() - 6);
+ s.replace(QRegExp("%20")," ");
+ qDebug("adding "+s+" to playlist");
// numberofentries=2
// File1=http
- // Title
+// Title
// Length
@@ -1297,21 +1324,25 @@ void PlayListWidget::readPls(const QString &filename) {
- s=s.replace( QRegExp("\\"),"/");
-// Lview->insertLine(t.readLine(),-1);
-// s=t.readLine();
-// s=s.right(s.length()-2);
- DocLnk lnk( s );
- QFileInfo f(s);
- QString name = f.baseName();
- name = name.right(name.length()-name.findRev("\\",-1,TRUE)-1);
+ s=s.replace( QRegExp("\\"),"/");
+ DocLnk lnk( s );
+ QFileInfo f(s);
+ QString name = f.baseName();
+ if(name.left(4)=="http")
+ name = s.right( s.length() - 7);
+ else
+ name=s;
+ name = name.right(name.length()-name.findRev("\\",-1,TRUE)-1);
// QFileInfo f(s);
// QString name = f.baseName();
-// // name = name.left(name.length()-4);
+// name = name.left(name.length()-4);
// name = name.right(name.findRev("/",0,TRUE));
- lnk.setName( name);
- lnk.setFile( s+"/");
- lnk.setType("audio/x-mpegurl");
-
- qDebug("DocLnk add "+name);
- d->selectedFiles->addToSelection( lnk);
- }
+ lnk.setName( name);
+ if(s.at(s.length()-4) == '.')
+ lnk.setFile( s);
+ else
+ lnk.setFile( s+"/");
+ lnk.setType("audio/x-mpegurl");
+
+ qDebug("DocLnk add "+name);
+ d->selectedFiles->addToSelection( lnk);
+ }
}
diff --git a/core/multimedia/opieplayer/playlistwidget.h b/core/multimedia/opieplayer/playlistwidget.h
index 5837ed3..7718a8c 100644
--- a/core/multimedia/opieplayer/playlistwidget.h
+++ b/core/multimedia/opieplayer/playlistwidget.h
@@ -77,3 +77,2 @@ private:
void readm3u(const QString &);
- void writem3u(const QString &);
void readPls(const QString &);
@@ -88,2 +87,3 @@ private:
private slots:
+ void writem3u();
void scanForAudio();