summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-08-21 00:20:22 (UTC)
committer harlekin <harlekin>2002-08-21 00:20:22 (UTC)
commitc198ae0217f761418f7170d08a94da3864e47583 (patch) (side-by-side diff)
tree096790ff5389ea30f61912f72338e5642edaa667
parent491f95a2c6a5676f08520e494e125ba8b20e0eae (diff)
downloadopie-c198ae0217f761418f7170d08a94da3864e47583.zip
opie-c198ae0217f761418f7170d08a94da3864e47583.tar.gz
opie-c198ae0217f761418f7170d08a94da3864e47583.tar.bz2
fixes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/lib.cpp5
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.cpp19
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.cpp2
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
@@ -105,12 +105,13 @@ Lib::Lib(XineVideoWidget* widget) {
xine_register_event_listener( m_xine, xine_event_handler, this );
}
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
@@ -5,8 +5,9 @@
#include <qpe/fileselector.h>
#include <qpe/qpeapplication.h>
#include <qpe/lnkproperties.h>
#include <qpe/storage.h>
+#include <qpe/mimetype.h>
#include <qpe/applnk.h>
#include <qpopupmenu.h>
#include <qpe/config.h>
@@ -306,12 +307,16 @@ 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;
}
void PlayListWidget::initializeStates() {
@@ -951,13 +956,15 @@ void PlayListWidget::openFile() {
readm3u( filename );
} else if(filename.right(3) == "pls") {
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");
if(!lnk.writeLink()) {
@@ -1235,9 +1242,9 @@ 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);
}
skinsMenu->setItemChecked( item, TRUE);
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
@@ -378,9 +378,9 @@ void VideoWidget::makeVisible() {
showFullScreen();
resize( qApp->desktop()->size() );
slider->hide();
videoFrame-> setGeometry ( 0, 0, width ( ), height ( ));
-
+ qApp->processEvents();
} else {
showNormal();
showMaximized();
setBackgroundPixmap( *pixBg );