Added option for toggling sound

davidtranhq · Aug 6, 2020 · e2f0109 · e2f0109
1 parent aa839bf
commit e2f0109
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 0 deletions.
diff --git a/include/apu.hpp b/include/apu.hpp
@@ -27,6 +27,7 @@ class Apu
     void write_reg(uint8_t b, uint16_t adr);
     void set_speaker(Speaker *s);
     void reset();
+    void toggle_sound(bool b);
 
     private:
     // clockfreq/samplingrate

diff --git a/include/system.hpp b/include/system.hpp
@@ -44,6 +44,7 @@ class System
     bool is_running();
     void set_throttle(double factor);
     void set_debug(bool b);
+    void toggle_sound(bool b);
 
     // system setup
     bool load_cartridge(const std::string &path);

diff --git a/platforms/qt/include/mainwindow.h b/platforms/qt/include/mainwindow.h
@@ -61,6 +61,7 @@ private slots:
     void toggleAntiAlias(bool);
     void toggleForceDmg(bool);
     void openCustomPaletteWindow();
+    void toggleSound(bool);
 
     void update_display();
 

diff --git a/platforms/qt/src/mainwindow.cpp b/platforms/qt/src/mainwindow.cpp
@@ -124,6 +124,11 @@ void MainWindow::openCustomPaletteWindow()
 
 }
 
+void MainWindow::toggleSound(bool b)
+{
+    system_.toggle_sound(b);
+}
+
 void MainWindow::update_display()
 {
     QImage img {renderer_->image()};
@@ -156,6 +161,12 @@ void MainWindow::createActions()
     connect(forceDmgAct, SIGNAL(toggled(bool)), this, SLOT(toggleForceDmg(bool)));
     optionsMenu->addAction(forceDmgAct);
 
+    QAction *enableSoundAct = new QAction(tr("Enable Sound"), this);
+    enableSoundAct->setCheckable(true);
+    enableSoundAct->setChecked(true);
+    connect(enableSoundAct, SIGNAL(toggled(bool)), this, SLOT(toggleSound(bool)));
+    optionsMenu->addAction(enableSoundAct);
+
 
     QMenu *toolsMenu = menuBar()->addMenu(tr("&Tools"));
     toolsMenu->addAction(tr("Disassemble"), this, &MainWindow::showDisassembler);

diff --git a/src/apu.cpp b/src/apu.cpp
@@ -126,3 +126,8 @@ void Apu::set_speaker(Speaker *s)
     speaker_ = s;
 }
 
+void Apu::toggle_sound(bool b)
+{
+    speaker_->toggle(b);
+}
+
diff --git a/src/system.cpp b/src/system.cpp
@@ -189,6 +189,11 @@ void System::set_debug_callback(std::function<void()> fn)
     debug_callback_ = std::move(fn);
 }
 
+void System::toggle_sound(bool b)
+{
+    apu_.toggle_sound(b);
+}
+
 std::unordered_map<std::string, Memory_range> System::dump_memory() const
 {
     return memory_.dump();