Changeset 165 for smplayer/trunk/src/skingui/mediabarpanel.cpp

Timestamp:

May 16, 2014, 9:51:55 AM (11 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update trunk to latest 0.8.7

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/skingui/mediabarpanel.cpp (modified) (3 diffs)

smplayer/trunk/src/skingui/mediabarpanel.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2013 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
     umplayer, Copyright (C) 2010 Ori Rejwan
 
@@ -97 +97 @@
 {
     core = c;
-    connect(core, SIGNAL(mediaStartPlay()), this, SLOT(setDuration()) );
-    connect( core, SIGNAL(showTime(double)), this, SLOT(gotCurrentTime(double)) );
-    connect( core, SIGNAL(mediaInfoChanged()), this, SLOT(updateMediaInfo()) );
-    connect( core, SIGNAL(buffering()), this, SLOT(setBuffering()) );
+    connect(core, SIGNAL(mediaStartPlay()), this, SLOT(setDuration()));
+    connect(core, SIGNAL(newDuration(double)), this, SLOT(setDuration()));
+    connect(core, SIGNAL(showTime(double)), this, SLOT(gotCurrentTime(double)));
+    connect(core, SIGNAL(mediaInfoChanged()), this, SLOT(updateMediaInfo()));
+    connect(core, SIGNAL(buffering()), this, SLOT(setBuffering()));
 }
 
@@ -122 +123 @@
     //QString s = QString("%1 (%2x%3)").arg(core->mdat.displayName()).arg(core->mdat.video_width).arg(core->mdat.video_height);
     mediaPanel->setMediaLabelText(core->mdat.displayName());
-    QString s = QString("%1x%2").arg(core->mdat.video_width).arg(core->mdat.video_height);
-    mediaPanel->setResolutionLabelText(s);
+
+    if ((core->mdat.video_width != 0) && (core->mdat.video_height != 0)) {
+        QString s = QString("%1x%2").arg(core->mdat.video_width).arg(core->mdat.video_height);
+        mediaPanel->setResolutionLabelText(s);
+    } else {
+        mediaPanel->setResolutionLabelText(" ");
+    }
 }