use mp3s instead of wav which seems to work...

diff --git a/buliscores.pro.user b/buliscores.pro.user
index 01f7ad6..488f269 100644 (file)
--- a/buliscores.pro.user
+++ b/buliscores.pro.user
@@ -2,7 +2,7 @@
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>

-  <value type="int">0</value>
+  <value type="int">1</value>

  </data>
  <data>
   <variable>ProjectExplorer.Project.EditorSettings</variable>
  </data>
  <data>
   <variable>ProjectExplorer.Project.EditorSettings</variable>

@@ -128,15 +128,15 @@
      <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MaemoPackageCreationStep</value>
      <valuelist key="Qt4ProjectManager.BuildStep.MaemoPackage.LocalFiles" type="QVariantList">
       <value type="QString">/home/david/Projects/git-buliscores/src/buliscores.desktop</value>
      <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MaemoPackageCreationStep</value>
      <valuelist key="Qt4ProjectManager.BuildStep.MaemoPackage.LocalFiles" type="QVariantList">
       <value type="QString">/home/david/Projects/git-buliscores/src/buliscores.desktop</value>

-      <value type="QString">/home/david/Projects/git-buliscores/src/sounds/tor.wav</value>
-      <value type="QString">/home/david/Projects/git-buliscores/src/sounds/trillerpfeife.wav</value>
+      <value type="QString">/home/david/Projects/git-buliscores/src/sounds/tor.mp3</value>
+      <value type="QString">/home/david/Projects/git-buliscores/src/sounds/trillerpfeife.mp3</value>

      </valuelist>
      <value key="Qt4ProjectManager.BuildStep.MaemoPackage.Modified" type="bool">false</value>
      <value key="Qt4ProjectManager.BuildStep.MaemoPackage.RemoteExe" type="QString">/usr/lib/hildon-desktop/buliscores</value>
      <valuelist key="Qt4ProjectManager.BuildStep.MaemoPackage.RemoteFiles" type="QVariantList">
       <value type="QString">/usr/share/applications/hildon-home/buliscores.desktop</value>
      </valuelist>
      <value key="Qt4ProjectManager.BuildStep.MaemoPackage.Modified" type="bool">false</value>
      <value key="Qt4ProjectManager.BuildStep.MaemoPackage.RemoteExe" type="QString">/usr/lib/hildon-desktop/buliscores</value>
      <valuelist key="Qt4ProjectManager.BuildStep.MaemoPackage.RemoteFiles" type="QVariantList">
       <value type="QString">/usr/share/applications/hildon-home/buliscores.desktop</value>

-      <value type="QString">/usr/share/buliscores/tor.wav</value>
-      <value type="QString">/usr/share/buliscores/trillerpfeife.wav</value>
+      <value type="QString">/usr/share/buliscores/tor.mp3</value>
+      <value type="QString">/usr/share/buliscores/trillerpfeife.mp3</value>

      </valuelist>
      <value key="Version Number" type="QString">0.0.1</value>
     </valuemap>
      </valuelist>
      <value key="Version Number" type="QString">0.0.1</value>
     </valuemap>

@@ -213,19 +213,19 @@
     <valuelist key="Qt4ProjectManager.MaemoRunConfiguration.Arguments" type="QVariantList"/>
     <value key="Qt4ProjectManager.MaemoRunConfiguration.DeviceId" type="qulonglong">1</value>
     <valuelist key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedFiles" type="QVariantList">
     <valuelist key="Qt4ProjectManager.MaemoRunConfiguration.Arguments" type="QVariantList"/>
     <value key="Qt4ProjectManager.MaemoRunConfiguration.DeviceId" type="qulonglong">1</value>
     <valuelist key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedFiles" type="QVariantList">

-     <value type="QString">/home/david/Projects/buliscores-build-maemo/buliscores_0.0.1_armel.deb</value>
-     <value type="QString">/home/david/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/qtc-debugging-helper/libgdbmacros.so</value>
-    </valuelist>
-    <valuelist key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedHosts" type="QVariantList">

      <value type="QString">192.168.2.102</value>
      <value type="QString">192.168.2.102</value>
     </valuelist>
      <value type="QString">192.168.2.102</value>
      <value type="QString">192.168.2.102</value>
     </valuelist>

+    <valuelist key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedHosts" type="QVariantList">
+     <value type="QString">/home/david/Projects/buliscores-build-maemo/buliscores_0.0.1_armel.deb</value>
+     <value type="QString">/home/david/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/qtc-debugging-helper/libgdbmacros.so</value>
+    </valuelist>

     <valuelist key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedRemotePaths" type="QVariantList">
      <value type="QString">/home/developer/buliscores_0.0.1_armel.deb</value>
      <value type="QString">/home/developer/libgdbmacros.so</value>
     </valuelist>
     <valuelist key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedTimes" type="QVariantList">
     <valuelist key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedRemotePaths" type="QVariantList">
      <value type="QString">/home/developer/buliscores_0.0.1_armel.deb</value>
      <value type="QString">/home/developer/libgdbmacros.so</value>
     </valuelist>
     <valuelist key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedTimes" type="QVariantList">

-     <value type="QDateTime">2010-11-07T21:41:34</value>
+     <value type="QDateTime">2010-11-14T16:42:36</value>

      <value type="QDateTime">2010-11-07T21:33:18</value>
     </valuelist>
    </valuemap>
      <value type="QDateTime">2010-11-07T21:33:18</value>
     </valuelist>
    </valuemap>

diff --git a/debian/buliscores.install b/debian/buliscores.install
index a2f628e..ec35d9f 100644 (file)
--- a/debian/buliscores.install
+++ b/debian/buliscores.install
@@ -1,5 +1,5 @@
 /usr/lib/hildon-desktop/buliscores
 /usr/share/applications/hildon-home/buliscores.desktop
 /usr/lib/hildon-desktop/buliscores
 /usr/share/applications/hildon-home/buliscores.desktop

-/usr/share/buliscores/tor.wav
-/usr/share/buliscores/trillerpfeife.wav
+/usr/share/buliscores/tor.mp3
+/usr/share/buliscores/trillerpfeife.mp3

 
 

diff --git a/src/sounds/tor.mp3 b/src/sounds/tor.mp3
new file mode 100644 (file)
index 0000000..0ef15a4
Binary files /dev/null and b/src/sounds/tor.mp3 differ

diff --git a/src/sounds/trillerpfeife.mp3 b/src/sounds/trillerpfeife.mp3
new file mode 100644 (file)
index 0000000..f81027d
Binary files /dev/null and b/src/sounds/trillerpfeife.mp3 differ

diff --git a/src/src/mainwidget.cpp b/src/src/mainwidget.cpp
index f425006..1800d49 100644 (file)
--- a/src/src/mainwidget.cpp
+++ b/src/src/mainwidget.cpp
@@ -58,8 +58,8 @@ MainWidget::MainWidget(QWidget *parent) :
     connect(m_backend, SIGNAL(matchAdded(Match*)),
            this, SLOT(onMatchAdded(Match*)));
 
     connect(m_backend, SIGNAL(matchAdded(Match*)),
            this, SLOT(onMatchAdded(Match*)));
 

-    m_mediaObject_tor->setCurrentSource(Phonon::MediaSource("/usr/share/buliscores/tor.wav"));
-    m_mediaObject_pfeife->setCurrentSource(Phonon::MediaSource("/usr/share/buliscores/trillerpfeife.wav"));
+    m_mediaObject_tor->setCurrentSource(Phonon::MediaSource("/usr/share/buliscores/tor.mp3"));
+    m_mediaObject_pfeife->setCurrentSource(Phonon::MediaSource("/usr/share/buliscores/trillerpfeife.mp3"));

 
     Phonon::createPath(m_mediaObject_tor,     m_audioOutput_tor);
     Phonon::createPath(m_mediaObject_pfeife,  m_audioOutput_pfeife);
 
     Phonon::createPath(m_mediaObject_tor,     m_audioOutput_tor);
     Phonon::createPath(m_mediaObject_pfeife,  m_audioOutput_pfeife);

@@ -73,13 +73,20 @@ void MainWidget::mousePressEvent(QMouseEvent* event)
     if (event->button() == Qt::RightButton) {
         this->showSettingsDialog();
     } else {
     if (event->button() == Qt::RightButton) {
         this->showSettingsDialog();
     } else {

-//        qDebug() << "current volume: " << m_audioOutput_pfeife->volume();
-//        qDebug() << "MO state: " << m_mediaObject_pfeife->state();
-//        m_mediaObject_pfeife->seek(0);
-//        if (m_settings.value("Sounds", false).toBool()) {
-//            m_mediaObject_pfeife->play();
-//        }
-//        qDebug() << "MO state 2: " << m_mediaObject_pfeife->state();
+        qDebug() << "pfeife volume: " << m_audioOutput_pfeife->volume();
+        qDebug() << "tor volume: " << m_audioOutput_tor->volume();
+        qDebug() << "pfeife state: " << m_mediaObject_pfeife->state();
+        qDebug() << "tor state: " << m_mediaObject_pfeife->state();
+        m_mediaObject_pfeife->seek(0);
+        if (m_settings.value("Sounds", false).toBool()) {
+            m_mediaObject_pfeife->play();
+        }
+        m_mediaObject_tor->seek(0);
+        if (m_settings.value("Sounds", false).toBool()) {
+            m_mediaObject_tor->play();
+        }
+        qDebug() << "pfeife state 2: " << m_mediaObject_pfeife->state();
+        qDebug() << "tor state 2: " << m_mediaObject_pfeife->state();

     }
 }
 
     }
 }
 

diff --git a/src/src/matchdaymodel.cpp b/src/src/matchdaymodel.cpp
index 0fdedf3..52e01fc 100644 (file)
--- a/src/src/matchdaymodel.cpp
+++ b/src/src/matchdaymodel.cpp
@@ -61,17 +61,17 @@ QVariant MatchDayModel::data(const QModelIndex& index, int role) const
         case MatchState:
             switch(match->state()) {
             case Match::NotStarted:
         case MatchState:
             switch(match->state()) {
             case Match::NotStarted:

-                return QIcon(":/bullet-grey").pixmap(15,15);
+                return QIcon(":/bullet-grey").pixmap(20,20);

                 break;
             case Match::FirstHalf:
             case Match::SecondHalf:
                 break;
             case Match::FirstHalf:
             case Match::SecondHalf:

-                return QIcon(":/football").pixmap(15,15);
+                return QIcon(":/football").pixmap(20,20);

                 break;
             case Match::HalfTime:
                 break;
             case Match::HalfTime:

-                return QIcon(":/bullet-yellow").pixmap(15,15);
+                return QIcon(":/bullet-yellow").pixmap(20,20);

                 break;
             case Match::Finished:
                 break;
             case Match::Finished:

-                return QIcon(":/bullet-red").pixmap(15,15);
+                return QIcon(":/bullet-red").pixmap(20,20);

                 break;
             default:
                 return QVariant(QVariant::Invalid);
                 break;
             default:
                 return QVariant(QVariant::Invalid);