summaryrefslogtreecommitdiff
path: root/core/multimedia
Side-by-side diff
Diffstat (limited to 'core/multimedia') (more/less context) (show whitespace changes)
-rw-r--r--core/multimedia/opieplayer/libmad/libmadplugin.cpp13
-rw-r--r--core/multimedia/opieplayer/libmad/libmadplugin.h2
-rw-r--r--core/multimedia/opieplayer/libmpeg3/mpeg3io.c20
-rw-r--r--core/multimedia/opieplayer/playlistselection.cpp18
-rw-r--r--core/multimedia/opieplayer/playlistselection.h4
-rw-r--r--core/multimedia/opieplayer/playlistwidget.cpp98
6 files changed, 102 insertions, 53 deletions
diff --git a/core/multimedia/opieplayer/libmad/libmadplugin.cpp b/core/multimedia/opieplayer/libmad/libmadplugin.cpp
index 9f8ba65..8ede537 100644
--- a/core/multimedia/opieplayer/libmad/libmadplugin.cpp
+++ b/core/multimedia/opieplayer/libmad/libmadplugin.cpp
@@ -31,8 +31,9 @@
#include <locale.h>
#include <math.h>
#include <assert.h>
#include <qapplication.h>
+#include <qpe/config.h>
//#define HAVE_MMAP
#if defined(HAVE_MMAP)
@@ -46,8 +47,9 @@ extern "C" {
}
#define MPEG_BUFFER_SIZE 65536
+//#define MPEG_BUFFER_SIZE 32768 //16384 // 8192
//#define debugMsg(a) qDebug(a)
#define debugMsg(a)
@@ -164,9 +166,12 @@ bool LibMadPlugin::isFileSupported( const QString& path ) {
bool LibMadPlugin::open( const QString& path ) {
debugMsg( "LibMadPlugin::open" );
-
+ Config cfg("MediaPlayer");
+ cfg.setGroup("Options");
+ bufferSize = cfg.readNumEntry("MPeg_BufferSize",MPEG_BUFFER_SIZE);
+ qDebug("buffer size is %d", bufferSize);
d->bad_last_frame = 0;
d->flush = TRUE;
info = QString( "" );
@@ -196,9 +201,9 @@ bool LibMadPlugin::open( const QString& path ) {
}
#endif
if (d->input.data == 0) {
- d->input.data = (unsigned char *)malloc(MPEG_BUFFER_SIZE);
+ d->input.data = (unsigned char *)malloc( bufferSize /*MPEG_BUFFER_SIZE*/);
if (d->input.data == 0) {
qDebug("error allocating input buffer");
return FALSE;
}
@@ -368,9 +373,9 @@ bool LibMadPlugin::read() {
d->input.length = &d->input.data[d->input.length] - d->stream.next_frame);
}
do {
- len = ::read(d->input.fd, d->input.data + d->input.length, MPEG_BUFFER_SIZE - d->input.length);
+ len = ::read(d->input.fd, d->input.data + d->input.length, bufferSize /* MPEG_BUFFER_SIZE*/ - d->input.length);
}
while (len == -1 && errno == EINTR);
if (len == -1) {
@@ -379,9 +384,9 @@ bool LibMadPlugin::read() {
}
else if (len == 0) {
d->input.eof = 1;
- assert(MPEG_BUFFER_SIZE - d->input.length >= MAD_BUFFER_GUARD);
+ assert(bufferSize /*MPEG_BUFFER_SIZE*/ - d->input.length >= MAD_BUFFER_GUARD);
while (len < MAD_BUFFER_GUARD)
d->input.data[d->input.length + len++] = 0;
}
diff --git a/core/multimedia/opieplayer/libmad/libmadplugin.h b/core/multimedia/opieplayer/libmad/libmadplugin.h
index b240b77..46cd4a1 100644
--- a/core/multimedia/opieplayer/libmad/libmadplugin.h
+++ b/core/multimedia/opieplayer/libmad/libmadplugin.h
@@ -102,9 +102,9 @@ public:
private:
LibMadPluginData *d;
QString info;
-
+int bufferSize;
};
#endif
diff --git a/core/multimedia/opieplayer/libmpeg3/mpeg3io.c b/core/multimedia/opieplayer/libmpeg3/mpeg3io.c
index c5807a7..c5cae00 100644
--- a/core/multimedia/opieplayer/libmpeg3/mpeg3io.c
+++ b/core/multimedia/opieplayer/libmpeg3/mpeg3io.c
@@ -33,18 +33,18 @@ int mpeg3_copy_fs(mpeg3_fs_t *dst, mpeg3_fs_t *src)
}
long mpeg3io_get_total_bytes(mpeg3_fs_t *fs)
{
-/*
- * struct stat st;
- * if(stat(fs->path, &st) < 0) return 0;
- * return (long)st.st_size;
- */
-
- fseek(fs->fd, 0, SEEK_END);
- fs->total_bytes = ftell(fs->fd);
- fseek(fs->fd, 0, SEEK_SET);
- return fs->total_bytes;
+
+ struct stat st;
+ if(stat(fs->path, &st) < 0) return 0;
+ return (long)st.st_size;
+
+
+/* fseek(fs->fd, 0, SEEK_END); */
+/* fs->total_bytes = ftell(fs->fd); */
+/* fseek(fs->fd, 0, SEEK_SET); */
+/* return fs->total_bytes; */
}
int mpeg3io_open_file(mpeg3_fs_t *fs)
{
diff --git a/core/multimedia/opieplayer/playlistselection.cpp b/core/multimedia/opieplayer/playlistselection.cpp
index 6259b3f..8f3711a 100644
--- a/core/multimedia/opieplayer/playlistselection.cpp
+++ b/core/multimedia/opieplayer/playlistselection.cpp
@@ -18,8 +18,10 @@
**
**********************************************************************/
#include <qpe/applnk.h>
#include <qpe/resource.h>
+#include <qpe/config.h>
+
#include <qpainter.h>
#include <qimage.h>
#include <qheader.h>
#include <qlistview.h>
@@ -49,9 +51,9 @@ private:
PlayListSelection::PlayListSelection( QWidget *parent, const char *name )
: QListView( parent, name )
{
- qDebug("starting playlistselector");
+// qDebug("starting playlistselector");
// #ifdef USE_PLAYLIST_BACKGROUND
// setStaticBackground( TRUE );
// setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/background" ) );
@@ -184,4 +186,18 @@ void PlayListSelection::unSelect()
{
QListViewItem *item = selectedItem();
setSelected( currentItem(), FALSE);
} \ No newline at end of file
+
+void PlayListSelection::writeCurrent( Config& cfg ) {
+ cfg.setGroup("PlayList");
+ QListViewItem *item = selectedItem();
+ if ( item )
+ cfg.writeEntry("current", item->text(0) );
+ qDebug(item->text(0));
+
+}
+
+void PlayListSelection::setSelectedItem(const QString &strk ) {
+// setSelected( item, TRUE );
+// ensureItemVisible( selectedItem() );
+}
diff --git a/core/multimedia/opieplayer/playlistselection.h b/core/multimedia/opieplayer/playlistselection.h
index ba37271..d10bc82 100644
--- a/core/multimedia/opieplayer/playlistselection.h
+++ b/core/multimedia/opieplayer/playlistselection.h
@@ -22,9 +22,9 @@
#include <qlist.h>
#include <qlistview.h>
#include <qpe/applnk.h>
-
+#include <qpe/config.h>
class PlayListSelection : public QListView {
Q_OBJECT
public:
@@ -37,8 +37,10 @@ public slots:
void removeSelected(); // Remove a media file from the playlist
void moveSelectedUp(); // Move the media file up the playlist so it is played earlier
void moveSelectedDown(); // Move the media file down the playlist so it is played later
void unSelect();
+ void writeCurrent( Config &);
+ void setSelectedItem( const QString & );
bool prev();
bool next();
bool first();
bool last();
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index 3b8f6d7..63df715 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -24,8 +24,9 @@
#include <qpe/qpetoolbar.h>
#include <qpe/fileselector.h>
#include <qpe/qpeapplication.h>
#include <qpe/lnkproperties.h>
+#include <qpe/storage.h>
#include <qpe/applnk.h>
#include <qpe/config.h>
#include <qpe/global.h>
@@ -215,8 +216,11 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
audioView->addColumn(tr("Media"),-1);
audioView->setColumnAlignment(1, Qt::AlignRight);
audioView->setColumnAlignment(2, Qt::AlignRight);
audioView->setAllColumnsShowFocus(TRUE);
+// audioView->setMultiSelection( TRUE );
+// audioView->setSelectionMode( QListView::Extended);
+
tabWidget->insertTab(aTab,tr("Audio"));
QPEApplication::setStylusOperation( audioView->viewport(),QPEApplication::RightOnHold);
connect( audioView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
@@ -237,8 +241,11 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
videoView->addColumn(tr("Media"),-1);
videoView->setColumnAlignment(1, Qt::AlignRight);
videoView->setColumnAlignment(2, Qt::AlignRight);
videoView->setAllColumnsShowFocus(TRUE);
+// videoView->setMultiSelection( TRUE );
+// videoView->setSelectionMode( QListView::Extended);
+
QPEApplication::setStylusOperation( videoView->viewport(),QPEApplication::RightOnHold);
connect( videoView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
this,SLOT( viewPressed(int, QListViewItem *, const QPoint&, int)) );
@@ -317,33 +324,35 @@ void PlayListWidget::initializeStates() {
void PlayListWidget::readConfig( Config& cfg ) {
cfg.setGroup("PlayList");
-
+ QString currentString = cfg.readEntry("current", "" );
int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 );
-
for ( int i = 0; i < noOfFiles; i++ ) {
QString entryName;
entryName.sprintf( "File%i", i + 1 );
QString linkFile = cfg.readEntry( entryName );
DocLnk lnk( linkFile );
- if ( lnk.isValid() )
+ if ( lnk.isValid() ) {
d->selectedFiles->addToSelection( lnk );
}
}
+// d->selectedFiles->setSelectedItem( (const QString &)currentString);
+}
void PlayListWidget::writeConfig( Config& cfg ) const {
- cfg.setGroup("PlayList");
+ d->selectedFiles->writeCurrent( cfg);
+ cfg.setGroup("PlayList");
int noOfFiles = 0;
-
d->selectedFiles->first();
do {
const DocLnk *lnk = d->selectedFiles->current();
if ( lnk ) {
QString entryName;
entryName.sprintf( "File%i", noOfFiles + 1 );
+ qDebug(entryName);
cfg.writeEntry( entryName, lnk->linkFile() );
// if this link does exist, add it so we have the file
// next time...
if ( !QFile::exists( lnk->linkFile() ) ) {
@@ -360,13 +369,11 @@ void PlayListWidget::writeConfig( Config& cfg ) const {
}
}
noOfFiles++;
}
- } while ( d->selectedFiles->next() );
-
+ }
+ while ( d->selectedFiles->next() );
cfg.writeEntry("NumberOfFiles", noOfFiles );
-
-
}
void PlayListWidget::addToSelection( const DocLnk& lnk ) {
@@ -385,29 +392,27 @@ void PlayListWidget::clearList() {
}
void PlayListWidget::addAllToList() {
- DocLnkSet files;
- Global::findDocuments(&files, "video/*;audio/*");
- QListIterator<DocLnk> dit( files.children() );
- for ( ; dit.current(); ++dit )
- d->selectedFiles->addToSelection( **dit );
+ DocLnkSet filesAll;
+ Global::findDocuments(&filesAll, "video/*;audio/*");
+ QListIterator<DocLnk> Adit( filesAll.children() );
+ for ( ; Adit.current(); ++Adit )
+ d->selectedFiles->addToSelection( **Adit );
}
void PlayListWidget::addAllMusicToList() {
- DocLnkSet files;
- Global::findDocuments(&files, "audio/*");
+// DocLnkSet files;
+// Global::findDocuments(&files, "audio/*");
QListIterator<DocLnk> dit( files.children() );
for ( ; dit.current(); ++dit )
d->selectedFiles->addToSelection( **dit );
}
void PlayListWidget::addAllVideoToList() {
- DocLnkSet files;
- Global::findDocuments(&files, "video/*");
- QListIterator<DocLnk> dit( files.children() );
+ QListIterator<DocLnk> dit( vFiles.children() );
for ( ; dit.current(); ++dit )
d->selectedFiles->addToSelection( **dit );
}
@@ -587,21 +592,25 @@ void PlayListWidget::saveList() {
filename = fileDlg->LineEdit1->text();//+".playlist";
// qDebug("saving playlist "+filename+".playlist");
Config cfg( filename +".playlist");
writeConfig( cfg );
- if( playLists->selected()->name() == filename) {
-// qDebug("same name so delete lnk");
- QFile().remove(playLists->selected()->file());
- QFile().remove(playLists->selected()->linkFile());
- playLists->reread();
- }
+// qDebug("same name so delete lnk??");
+// if( playLists->selected()->name() == filename) {
+
+// qDebug("same name so delete lnk");
+// QFile().remove(playLists->selected()->file());
+// QFile().remove(playLists->selected()->linkFile());
+// playLists->reread();
+// }
+// qDebug("new doclnk");
DocLnk lnk;
// lnk.setComment( "");
lnk.setFile(QDir::homeDirPath()+"/Settings/"+filename+".playlist.conf"); //sets File property
lnk.setType("playlist/plain");// hey is this a REGISTERED mime type?!?!? ;D
lnk.setIcon("mpegplayer/playlist2");
lnk.setName( filename); //sets file name
+ qDebug(filename);
if(!lnk.writeLink())
qDebug("Writing doclink did not work");
}
Config config( "MediaPlayer" );
@@ -620,13 +629,16 @@ void PlayListWidget::loadList( const DocLnk & lnk) {
// qDebug("load list "+ name+".playlist");
clearList();
Config cfg( name+".playlist");
readConfig(cfg);
+
tabWidget->setCurrentPage(0);
+
Config config( "MediaPlayer" );
config.writeEntry("CurrentPlaylist", name);
- d->selectedFiles->first();
+// d->selectedFiles->first();
}
+
}
void PlayListWidget::setPlaylist( bool shown ) {
if ( shown )
@@ -782,9 +794,10 @@ void PlayListWidget::btnPlay(bool b) {
mediaPlayerState->setPlaying(b);
// qApp->processEvents();
d->selectedFiles->removeSelected( );
tabWidget->setCurrentPage(1);
- d->selectedFiles->unSelect();
+ audioView->clearSelection();
+// d->selectedFiles->unSelect();
// mediaPlayerState->setPlaying(FALSE);
}
break;
case 2:
@@ -793,9 +806,10 @@ void PlayListWidget::btnPlay(bool b) {
mediaPlayerState->setPlaying(b);
qApp->processEvents();
d->selectedFiles->removeSelected( );
tabWidget->setCurrentPage(2);
- d->selectedFiles->unSelect();
+ videoView->clearSelection();
+// d->selectedFiles->unSelect();
// mediaPlayerState->setPlaying(FALSE);
}
break;
};
@@ -904,35 +918,47 @@ void PlayListWidget::listDelete() {
void PlayListWidget::populateAudioView() {
// if(files)
// files.~DocLnkSet();
+ StorageInfo storageInfo;
+ const QList<FileSystem> &fs = storageInfo.fileSystems();
+
Global::findDocuments(&files, "audio/*");
QListIterator<DocLnk> dit( files.children() );
+ QListIterator<FileSystem> it ( fs );
audioView->clear();
QString storage;
for ( ; dit.current(); ++dit ) {
+ for( ; it.current(); ++it ){
+ const QString name = (*it)->name();
+ const QString path = (*it)->path();
+ if(dit.current()->file().find(path) != -1 ) storage=name;
+ }
+
QListViewItem * newItem;
- if(dit.current()->file().find("/mnt/cf") != -1 ) storage=tr("CF");
- else if(dit.current()->file().find("/mnt/hda") != -1 ) storage=tr("CF");
- else if(dit.current()->file().find("/mnt/card") != -1 ) storage=tr("SD");
- else storage=tr("RAM");
if ( QFile( dit.current()->file()).exists() ) {
newItem= /*(void)*/ new QListViewItem( audioView, dit.current()->name(), QString::number( QFile( dit.current()->file()).size() ), storage);
newItem->setPixmap(0, Resource::loadPixmap( "mpegplayer/musicfile" ));
}
}
}
void PlayListWidget::populateVideoView() {
+ StorageInfo storageInfo;
+ const QList<FileSystem> &fs = storageInfo.fileSystems();
+
Global::findDocuments(&vFiles, "video/*");
QListIterator<DocLnk> Vdit( vFiles.children() );
+ QListIterator<FileSystem> it ( fs );
videoView->clear();
QString storage;
for ( ; Vdit.current(); ++Vdit ) {
- if( Vdit.current()->file().find("/mnt/cf") != -1 ) storage=tr("CF");
- else if( Vdit.current()->file().find("/mnt/hda") != -1 ) storage=tr("CF");
- else if( Vdit.current()->file().find("/mnt/card") != -1 ) storage=tr("SD");
- else storage=tr("RAM");
+ for( ; it.current(); ++it ){
+ const QString name = (*it)->name();
+ const QString path = (*it)->path();
+ if( Vdit.current()->file().find(path) != -1 ) storage=name;
+ }
+
QListViewItem * newItem;
if ( QFile( Vdit.current()->file()).exists() ) {
newItem= /*(void)*/ new QListViewItem( videoView, Vdit.current()->name(), QString::number( QFile( Vdit.current()->file()).size() ), storage);
newItem->setPixmap(0, Resource::loadPixmap( "mpegplayer/videofile" ));