author | harlekin <harlekin> | 2002-08-21 00:20:22 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-08-21 00:20:22 (UTC) |
commit | c198ae0217f761418f7170d08a94da3864e47583 (patch) (side-by-side diff) | |
tree | 096790ff5389ea30f61912f72338e5642edaa667 /noncore/multimedia | |
parent | 491f95a2c6a5676f08520e494e125ba8b20e0eae (diff) | |
download | opie-c198ae0217f761418f7170d08a94da3864e47583.zip opie-c198ae0217f761418f7170d08a94da3864e47583.tar.gz opie-c198ae0217f761418f7170d08a94da3864e47583.tar.bz2 |
fixes
-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 @@ -108,6 +108,7 @@ 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 @@ -8,2 +8,3 @@ #include <qpe/storage.h> +#include <qpe/mimetype.h> @@ -309,6 +310,10 @@ 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; } @@ -954,2 +959,3 @@ void PlayListWidget::openFile() { } else { + /* FIXME ....... AUDIO/X-MPEGURL is bad*/ DocLnk lnk; @@ -958,3 +964,4 @@ void PlayListWidget::openFile() { 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"); @@ -1238,3 +1245,3 @@ 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 @@ -381,3 +381,3 @@ void VideoWidget::makeVisible() { videoFrame-> setGeometry ( 0, 0, width ( ), height ( )); - + qApp->processEvents(); } else { |