Merge branch 'music_ext_sprint_1' of https://github.com/MicheleCarbonera/backend into music_ext_sprint_1

Author: Antonino Tramontana

audioControls.py

@@ -0,0 +1,54 @@
+#    CoderBot, a didactical programmable robot.
+#    Copyright (C) 2014, 2015 Roberto Previtera <info@coderbot.org>
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License along
+#    with this program; if not, write to the Free Software Foundation, Inc.,
+#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+############################################################################
+#    CoderBot, a didactical programmable robot.
+#    Copyright (C) 2014, 2015 Roberto Previtera <info@coderbot.org>
+#
+#    MUSICAL EXTENTION for CoderBot
+#    This extention is develop by:
+#    Michele Carbonera - miki_992@hotmail.it - m.carbonera@campus.unimib.it - michele.carbonera@unimib.it
+#    Antonino Tramontana - a.tramontana1@campus.unimib.it
+#    Copyright (C) 2020 
+############################################################################
+
+import os
+import alsaaudio
+
+class AudioCtrl:
+    mixer = None
+    _instance = None
+
+    @classmethod
+    def get_instance(cls):
+        if cls._instance is None:
+            cls._instance = AudioCtrl()
+        return cls._instance
+
+    def __init__(self):
+        self.mixer = alsaaudio.Mixer('PCM', cardindex=1)
+        #self.mixer = alsaaudio.PCM(device='numid=1', cardindex=1)
+
+    def getVolume(self):
+        print(self.mixer.getvolume())
+    
+    def setVolume(self,valueVolume):
+        self.mixer.setvolume(valueVolume)
+'''
+if __name__ == "__main__":
+    a = AudioCtrl()
+    a.setVolume(20)
+    #a.setVolume(100)'''

coderbot.cfg

@@ -35,5 +35,6 @@
    "ctrl_hud_image":"",
    "load_at_start":"",
    "sound_start":"$startup.mp3",
-   "encoder":"True"
+   "encoder":"True",
+   "audio_volume_level":"100"
 }

main.py

@@ -30,6 +30,7 @@
 from config import Config
 from cnn_manager import CNNManager
 from event import EventManager
+from audioControls import AudioCtrl
 
 # Logging configuration
 logger = logging.getLogger()
@@ -59,6 +60,8 @@
 app.prog = None
 app.shutdown_requested = False
 
+
+
 ## New API and web application
 
 # API v2 is defined in v2.yml and its methods are in api.py
@@ -155,6 +158,8 @@ def handle_config():
     """
     Overwrite configuration file on disk and reload it
     """
+    audioCtrl = AudioCtrl.get_instance()
+    audioCtrl.setVolume(int(request.form['audio_volume_level']))
     Config.write(updateDict(app.bot_config, request.form))
     app.bot_config = Config.get()
     return "ok"
@@ -470,6 +475,10 @@ def run_server():
                                         encoder=bool(app.bot_config.get('encoder')))
             audio = Audio.get_instance()
             audio.say(app.bot_config.get("sound_start"))
+
+            audioCtrl = AudioCtrl.get_instance()
+            audioCtrl.setVolume(int(app.bot_config.get['audio_volume_level']))
+
             try:
                 cam = Camera.get_instance()
                 Motion.get_instance()