From: unknown <Manu@.(none)>
Date: Sat, 27 Feb 2010 13:08:17 +0000 (+0100)
Subject: Inserimento suoni
X-Git-Url: http://git.maemo.org/git/?p=qmemory;a=commitdiff_plain;h=21ff03c4e76216f2ce49d04ae48d9209b5642e27

Inserimento suoni
Sono stati inseriti dei suoni wav quando si cliccano i bottoni
TODO:linkare i wave in file qrc
PS: Sotto Windows copiare la cartella dei suoni in Release/debug
altrimenti viene eseguito il suono di sistema
---

diff --git a/crazybutton.h b/crazybutton.h
index d32310d..f197c75 100644
--- a/crazybutton.h
+++ b/crazybutton.h
@@ -13,6 +13,7 @@ public:
 
 public slots:
      void changeColor();
+     bool getStateColor(){return col;}
 protected:
      void mousePressEvent(QMouseEvent *e);
      void mouseReleaseEvent(QMouseEvent *e);
diff --git a/mainwindow.cpp b/mainwindow.cpp
index abad199..a508562 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -2,6 +2,7 @@
 #include "ui_mainwindow.h"
 #include <QMessageBox>
 #include <QDebug>
+#include <QSound>
 
 MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent),
@@ -95,30 +96,48 @@ void MainWindow::cliccaBottone(int id)
 {
     switch(id){
         case 0:
+                if(ui->pushButton->getStateColor())
+                    QSound::play("sounds/dog.wav");
                 ui->pushButton->changeColor();
                 break;
         case 1:
+                if(ui->pushButton_2->getStateColor())
+                    QSound::play("sounds/cat.wav");
                 ui->pushButton_2->changeColor();
                 break;
         case 2:
+                if(ui->pushButton_3->getStateColor())
+                    QSound::play("sounds/cow.wav");
                 ui->pushButton_3->changeColor();
                 break;
         case 3:
+                if(ui->pushButton_4->getStateColor())
+                    QSound::play("sounds/duck.wav");
                 ui->pushButton_4->changeColor();
                 break;
         case 4:
+                if(ui->pushButton_5->getStateColor())
+                    QSound::play("sounds/goat.wav");
                 ui->pushButton_5->changeColor();
                 break;
         case 5:
+                if(ui->pushButton_6->getStateColor())
+                    QSound::play("sounds/donkey.wav");
                 ui->pushButton_6->changeColor();
                 break;
         case 6:
+                if(ui->pushButton_7->getStateColor())
+                    QSound::play("sounds/crow.wav");
                 ui->pushButton_7->changeColor();
                 break;
         case 7:
+                if(ui->pushButton_8->getStateColor())
+                    QSound::play("sounds/rosteer.wav");
                 ui->pushButton_8->changeColor();
                 break;
         case 8:
+                if(ui->pushButton_9->getStateColor())
+                    QSound::play("sounds/bleeeh.wav");
                 ui->pushButton_9->changeColor();
                 break;
     }
@@ -129,39 +148,48 @@ MainWindow::~MainWindow()
     delete ui;
 }
 void MainWindow::clickA(){
+    QSound::play("sounds/dog.wav");
     emit cliccatoIlBottone(0);
 
 }
 
 void MainWindow::clickB(){
+    QSound::play("sounds/cat.wav");
     emit cliccatoIlBottone(1);
 
 }
 void MainWindow::clickC(){
+    QSound::play("sounds/cow.wav");
     emit cliccatoIlBottone(2);
 
 }
 void MainWindow::clickD(){
+    QSound::play("sounds/duck.wav");
     emit cliccatoIlBottone(3);
 
 }
 void MainWindow::clickE(){
+    QSound::play("sounds/goat.wav");
     emit cliccatoIlBottone(4);
 
 }
 void MainWindow::clickF(){
+    QSound::play("sounds/donkey.wav");
     emit cliccatoIlBottone(5);
 
 }
 void MainWindow::clickG(){
+    QSound::play("sounds/crow.wav");
     emit cliccatoIlBottone(6);
 
 }
 void MainWindow::clickH(){
+    QSound::play("sounds/rosteer.wav");
     emit cliccatoIlBottone(7);
 
 }
 void MainWindow::clickI(){
+    QSound::play("sounds/bleeeh.wav");
     emit cliccatoIlBottone(8);
 
 }
diff --git a/sounds/bleeeh.wav b/sounds/bleeeh.wav
new file mode 100644
index 0000000..a22d13d
Binary files /dev/null and b/sounds/bleeeh.wav differ
diff --git a/sounds/cat.wav b/sounds/cat.wav
new file mode 100644
index 0000000..8fc3ee9
Binary files /dev/null and b/sounds/cat.wav differ
diff --git a/sounds/cow.wav b/sounds/cow.wav
new file mode 100644
index 0000000..91095ab
Binary files /dev/null and b/sounds/cow.wav differ
diff --git a/sounds/crow.wav b/sounds/crow.wav
new file mode 100644
index 0000000..a6e3414
Binary files /dev/null and b/sounds/crow.wav differ
diff --git a/sounds/dog.wav b/sounds/dog.wav
new file mode 100644
index 0000000..5d3b3ab
Binary files /dev/null and b/sounds/dog.wav differ
diff --git a/sounds/donkey.wav b/sounds/donkey.wav
new file mode 100644
index 0000000..f8dc15b
Binary files /dev/null and b/sounds/donkey.wav differ
diff --git a/sounds/duck.wav b/sounds/duck.wav
new file mode 100644
index 0000000..312d482
Binary files /dev/null and b/sounds/duck.wav differ
diff --git a/sounds/goat.wav b/sounds/goat.wav
new file mode 100644
index 0000000..b214b36
Binary files /dev/null and b/sounds/goat.wav differ
diff --git a/sounds/rosteer.wav b/sounds/rosteer.wav
new file mode 100644
index 0000000..fd6d0a0
Binary files /dev/null and b/sounds/rosteer.wav differ
diff --git a/testThread.cpp b/testThread.cpp
index 1d52705..fcdf34a 100644
--- a/testThread.cpp
+++ b/testThread.cpp
@@ -16,6 +16,7 @@ TestThread::~TestThread(){
 
 }
 void TestThread::run(){
+    sleep(1);
     while(true){
 
     qsrand(QDateTime::currentDateTime().toTime_t());
@@ -28,9 +29,9 @@ void TestThread::run(){
     {
       emit generate(sequenza.at(i));
       qDebug()<<sequenza.at(i);
-      msleep(500 - (_score*5));
+      msleep(500 - (_score*2));
       emit generate(sequenza.at(i));
-      msleep(500 - (_score*5));
+      msleep(500 - (_score*2));
       i++;
     }
     i=0;
@@ -55,6 +56,7 @@ void TestThread::updateCaption(int inputUser){
             _score++;
             emit score(_score);
             if(index==sequenza.size()){
+                sleep(1);
                 attendiInputUtente=false;
                 index=0;
             }
diff --git a/ui_mainwindow.h b/ui_mainwindow.h
index ed062e7..bd820d5 100644
--- a/ui_mainwindow.h
+++ b/ui_mainwindow.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'mainwindow.ui'
 **
-** Created: Sat 27. Feb 10:40:53 2010
+** Created: Sat 27. Feb 14:00:09 2010
 **      by: Qt User Interface Compiler version 4.6.2
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!