From: Flavio Tordini <flavio.tordini@gmail.com>
Date: Mon, 19 Oct 2009 19:38:08 +0000 (+0200)
Subject: Windows icon and fixes
X-Git-Tag: 0.8~53
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1edc17446207c4bb8c82fc13838d1dceb915bd40;p=minitube

Windows icon and fixes
---

diff --git a/minitube.ico b/minitube.ico
new file mode 100644
index 0000000..9a3acbe
Binary files /dev/null and b/minitube.ico differ
diff --git a/minitube.pro b/minitube.pro
index e83f364..c5150fd 100755
--- a/minitube.pro
+++ b/minitube.pro
@@ -120,3 +120,6 @@ unix {
     icon128.path = $$DATADIR/icons/hicolor/128x128/apps
     icon128.files += data/128x128/minitube.png
 }
+win32 {
+    RC_FILE = minitube.rc
+}
diff --git a/minitube.rc b/minitube.rc
new file mode 100644
index 0000000..2c1795b
--- /dev/null
+++ b/minitube.rc
@@ -0,0 +1,2 @@
+IDI_ICON1               ICON    DISCARDABLE     "minitube.ico"
+
diff --git a/src/MediaView.cpp b/src/MediaView.cpp
index 08173c5..d5b5ec1 100644
--- a/src/MediaView.cpp
+++ b/src/MediaView.cpp
@@ -187,10 +187,12 @@ void MediaView::stateChanged(Phonon::State newState, Phonon::State /*oldState*/)
         // but Phonon on Linux needs a little more help to start playback
         if (!reallyStopped) mediaObject->play();
 
+#ifdef Q_WS_MAC
         // Workaround for Mac playback start problem
         if (!timerPlayFlag) {
             workaroundTimer->start();
         }
+#endif
 
         break;