Merge branch 'master' into QJson_Experiments

[buliscores] / src / src / mainwidget.cpp

diff --git a/src/src/mainwidget.cpp b/src/src/mainwidget.cpp
index bff59a8..35f8af9 100644 (file)
--- a/src/src/mainwidget.cpp
+++ b/src/src/mainwidget.cpp
@@ -8,11 +8,15 @@
 #include "matchdaymodel.h"
 #include "settingsdialog.h"
 
+//QJSON
+#include <qjson/serializer.h>
+
 MainWidget::MainWidget(QWidget *parent) :
     QWidget(parent),
     m_mediaObject_tor(new Phonon::MediaObject(this)),
     m_mediaObject_pfeife(new Phonon::MediaObject(this)),
-    m_audioOutput(new Phonon::AudioOutput(Phonon::CommunicationCategory, this)),
+    m_audioOutput_tor(new Phonon::AudioOutput(Phonon::MusicCategory, this)),
+    m_audioOutput_pfeife(new Phonon::AudioOutput(Phonon::MusicCategory, this)),
     m_backend(new BackendKicker(this)),
     m_datamodel(new MatchDayModel(this, m_backend)),
     m_scoretbl(new ScoreTable(m_datamodel)),
@@ -42,7 +46,10 @@ MainWidget::MainWidget(QWidget *parent) :
     // table
     m_layout.addWidget(&m_statuslbl);
     m_layout.addWidget(m_scoretbl);
+    m_layout.setSizeConstraint(QLayout::SetFixedSize);
     this->setLayout(&m_layout);
+    this->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+
     m_statuslbl.show();
 
     connect(m_settingsdlg, SIGNAL(accepted()),
@@ -57,27 +64,37 @@ 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"));
 
-    //m_audioOutput->volume()
-    Phonon::createPath(m_mediaObject_tor,     m_audioOutput);
-    Phonon::createPath(m_mediaObject_pfeife,  m_audioOutput);
+    Phonon::createPath(m_mediaObject_tor,     m_audioOutput_tor);
+    Phonon::createPath(m_mediaObject_pfeife,  m_audioOutput_pfeife);
 }
 
 void MainWidget::mousePressEvent(QMouseEvent* event)
 {
+    QJson::Serializer serializer;
+    QVariantMap data;
+
     qDebug() << "widget tapped";
 
     // only needed for testing on desktop
     if (event->button() == Qt::RightButton) {
         this->showSettingsDialog();
     } else {
-        qDebug() << "current volume: " << m_audioOutput->volumeDecibel();
-        qDebug() << "MO state: " << m_mediaObject_pfeife->state();
-        m_mediaObject_pfeife->seek(0);
-        m_mediaObject_pfeife->play();
-        qDebug() << "MO state 2: " << m_mediaObject_pfeife->state();
+        data.insert("BackendData", m_backend->serializableData());
+        qWarning() << serializer.serialize(m_backend->serializableData());
+
+//        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();
     }
 }
 
@@ -107,6 +124,7 @@ void MainWidget::onMatchAdded(Match* match) {
 
     connect(match, SIGNAL(stateChanged(Match::MatchState)),
             this, SLOT(onMatchStateChanged(Match::MatchState)));
+
     qDebug() << "Match (" << match->homeTeam() << " vs "
              << match->awayTeam() << ") : registering signals";
 }