From: David Solbach Date: Sun, 14 Nov 2010 17:58:22 +0000 (+0100) Subject: use mp3s instead of wav which seems to work... X-Git-Url: http://git.maemo.org/git/?p=buliscores;a=commitdiff_plain;h=a9bec97ac8b5176ac180573d1b737cce21694a8b use mp3s instead of wav which seems to work... --- diff --git a/buliscores.pro.user b/buliscores.pro.user index 01f7ad6..488f269 100644 --- a/buliscores.pro.user +++ b/buliscores.pro.user @@ -2,7 +2,7 @@ ProjectExplorer.Project.ActiveTarget - 0 + 1 ProjectExplorer.Project.EditorSettings @@ -128,15 +128,15 @@ Qt4ProjectManager.MaemoPackageCreationStep /home/david/Projects/git-buliscores/src/buliscores.desktop - /home/david/Projects/git-buliscores/src/sounds/tor.wav - /home/david/Projects/git-buliscores/src/sounds/trillerpfeife.wav + /home/david/Projects/git-buliscores/src/sounds/tor.mp3 + /home/david/Projects/git-buliscores/src/sounds/trillerpfeife.mp3 false /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 0.0.1 @@ -213,19 +213,19 @@ 1 - /home/david/Projects/buliscores-build-maemo/buliscores_0.0.1_armel.deb - /home/david/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/qtc-debugging-helper/libgdbmacros.so - - 192.168.2.102 192.168.2.102 + + /home/david/Projects/buliscores-build-maemo/buliscores_0.0.1_armel.deb + /home/david/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/qtc-debugging-helper/libgdbmacros.so + /home/developer/buliscores_0.0.1_armel.deb /home/developer/libgdbmacros.so - 2010-11-07T21:41:34 + 2010-11-14T16:42:36 2010-11-07T21:33:18 diff --git a/debian/buliscores.install b/debian/buliscores.install index a2f628e..ec35d9f 100644 --- 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/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 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 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 --- 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*))); - 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); @@ -73,13 +73,20 @@ void MainWidget::mousePressEvent(QMouseEvent* event) 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 --- 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: - return QIcon(":/bullet-grey").pixmap(15,15); + return QIcon(":/bullet-grey").pixmap(20,20); break; case Match::FirstHalf: case Match::SecondHalf: - return QIcon(":/football").pixmap(15,15); + return QIcon(":/football").pixmap(20,20); break; case Match::HalfTime: - return QIcon(":/bullet-yellow").pixmap(15,15); + return QIcon(":/bullet-yellow").pixmap(20,20); break; case Match::Finished: - return QIcon(":/bullet-red").pixmap(15,15); + return QIcon(":/bullet-red").pixmap(20,20); break; default: return QVariant(QVariant::Invalid);