Diffstat (limited to 'noncore/multimedia/opieplayer2') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/lib.cpp | 5 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 19 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 2 |
3 files changed, 17 insertions, 9 deletions
diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp index c187f52..b2143a0 100644 --- a/noncore/multimedia/opieplayer2/lib.cpp +++ b/noncore/multimedia/opieplayer2/lib.cpp @@ -107,8 +107,9 @@ Lib::Lib(XineVideoWidget* widget) { Lib::~Lib() { - delete m_config; + free( m_config ); xine_remove_event_listener( m_xine, xine_event_handler ); xine_exit( m_xine ); - delete m_videoOutput; + /* FIXME either free or delete but valgrind bitches against both */ + //free( m_videoOutput ); //delete m_audioOutput; diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp index 75e2979..098322b 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp @@ -7,4 +7,5 @@ #include <qpe/lnkproperties.h> #include <qpe/storage.h> +#include <qpe/mimetype.h> #include <qpe/applnk.h> @@ -308,8 +309,12 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) PlayListWidget::~PlayListWidget() { - if ( d->current ) { - delete d->current; - } - delete d; +/* fixing symptoms and not sources is entirely stupid - zecke */ +// Config cfg( "OpiePlayer" ); +// writeConfig( cfg ); + + if ( d->current ) { + delete d->current; + } + delete d; } @@ -953,9 +958,11 @@ void PlayListWidget::openFile() { readPls( filename ); } else { + /* FIXME ....... AUDIO/X-MPEGURL is bad*/ DocLnk lnk; lnk.setName(filename); //sets file name lnk.setFile(filename); //sets File property - lnk.setType("audio/x-mpegurl"); + //qWarning( "Mimetype: " + MimeType( QFile::encodeName(filename) ).id() ); + lnk.setType( MimeType( QFile::encodeName(filename) ).id() ); lnk.setExec("opieplayer"); lnk.setIcon("opieplayer2/MPEGPlayer"); @@ -1237,5 +1244,5 @@ void PlayListWidget::populateSkinsMenu() { void PlayListWidget::skinsMenuActivated(int item) { - for(int i = defaultSkinIndex; i > defaultSkinIndex - skinsMenu->count(); i--) { + for(uint i = defaultSkinIndex; i > defaultSkinIndex - skinsMenu->count(); i--) { skinsMenu->setItemChecked( i, FALSE); } diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index 53837c7..ffda2e4 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp @@ -380,5 +380,5 @@ void VideoWidget::makeVisible() { slider->hide(); videoFrame-> setGeometry ( 0, 0, width ( ), height ( )); - + qApp->processEvents(); } else { showNormal(); |