-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) { | |||
108 | Lib::~Lib() { | 108 | Lib::~Lib() { |
109 | delete m_config; | 109 | free( m_config ); |
110 | xine_remove_event_listener( m_xine, xine_event_handler ); | 110 | xine_remove_event_listener( m_xine, xine_event_handler ); |
111 | xine_exit( m_xine ); | 111 | xine_exit( m_xine ); |
112 | delete m_videoOutput; | 112 | /* FIXME either free or delete but valgrind bitches against both */ |
113 | //free( m_videoOutput ); | ||
113 | //delete m_audioOutput; | 114 | //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 @@ | |||
8 | #include <qpe/storage.h> | 8 | #include <qpe/storage.h> |
9 | #include <qpe/mimetype.h> | ||
9 | 10 | ||
@@ -309,6 +310,10 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
309 | PlayListWidget::~PlayListWidget() { | 310 | PlayListWidget::~PlayListWidget() { |
310 | if ( d->current ) { | 311 | /* fixing symptoms and not sources is entirely stupid - zecke */ |
311 | delete d->current; | 312 | // Config cfg( "OpiePlayer" ); |
312 | } | 313 | // writeConfig( cfg ); |
313 | delete d; | 314 | |
315 | if ( d->current ) { | ||
316 | delete d->current; | ||
317 | } | ||
318 | delete d; | ||
314 | } | 319 | } |
@@ -954,2 +959,3 @@ void PlayListWidget::openFile() { | |||
954 | } else { | 959 | } else { |
960 | /* FIXME ....... AUDIO/X-MPEGURL is bad*/ | ||
955 | DocLnk lnk; | 961 | DocLnk lnk; |
@@ -958,3 +964,4 @@ void PlayListWidget::openFile() { | |||
958 | lnk.setFile(filename); //sets File property | 964 | lnk.setFile(filename); //sets File property |
959 | lnk.setType("audio/x-mpegurl"); | 965 | //qWarning( "Mimetype: " + MimeType( QFile::encodeName(filename) ).id() ); |
966 | lnk.setType( MimeType( QFile::encodeName(filename) ).id() ); | ||
960 | lnk.setExec("opieplayer"); | 967 | lnk.setExec("opieplayer"); |
@@ -1238,3 +1245,3 @@ void PlayListWidget::populateSkinsMenu() { | |||
1238 | void PlayListWidget::skinsMenuActivated(int item) { | 1245 | void PlayListWidget::skinsMenuActivated(int item) { |
1239 | for(int i = defaultSkinIndex; i > defaultSkinIndex - skinsMenu->count(); i--) { | 1246 | for(uint i = defaultSkinIndex; i > defaultSkinIndex - skinsMenu->count(); i--) { |
1240 | skinsMenu->setItemChecked( i, FALSE); | 1247 | 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() { | |||
381 | videoFrame-> setGeometry ( 0, 0, width ( ), height ( )); | 381 | videoFrame-> setGeometry ( 0, 0, width ( ), height ( )); |
382 | 382 | qApp->processEvents(); | |
383 | } else { | 383 | } else { |