add interface for front-end sys for Music-Ext

Author: MicheleCarbonera

music.py

@@ -48,8 +48,9 @@ def get_instance(cls,managerPackage):
         return cls._instance
 
     def __init__(self,managerPackage):
-        os.putenv('AUDIODRIVER', 'alsa')
-        os.putenv('AUDIODEV', 'hw:1,0')
+        
+        #os.putenv('AUDIODRIVER', 'alsa')
+        #os.putenv('AUDIODEV', 'hw:1,0')
         self.managerPackage = managerPackage
         print("We have create a class: MUSICAL")
 
@@ -68,7 +69,8 @@ def play_pause(self, duration):
     # @param note: name of the note in the following format "A2"
     # @para alteration: if it is a diesis or a bemolle
     # @param time: duration of the note in seconds
-    def play_note(self, note, alteration='none', time=1.0, instrument='piano'):
+    def play_note(self, note, instrument='piano', alteration='none', time=1.0):
+        print(note)
         tfm = sox.Transformer()
 
         time = float(time)
@@ -134,17 +136,3 @@ def play_animal(self, instrument, note='G2', alteration='none', time=1.0):
         tfm.trim(0.0, end_time=0.5*time)
         #tfm.stretch(time, window=20)
         tfm.preview('./sounds/notes/' + instrument + '/audio.wav')
-
-           
-
-if __name__ == "__main__":
-    b = MusicPackageManager()
-    a = Music(b)
-    
-    a.play_note('C2')
-    a.play_pause(1)
-    a.play_note('E2')
-    a.play_note('C2',instrument="piano")
-    a.play_note('E2',instrument="guitar")
-    a.play_note('C2')
-    a.play_animal(instrument='cat')

musicPackages.py

@@ -90,11 +90,13 @@ class MusicPackageManager:
     def get_instance(cls):
         if cls._instance is None:
             cls._instance = MusicPackageManager()
+            print("make MusicPackageManager")
         return cls._instance
 
     def __init__(self):
         self.packages = dict()
         with open('./sounds/notes/music_package.json') as json_file:
+            print("99 musik pac")
             data = json.load(json_file)
             for p in data['packages']:
 

program.py

@@ -31,13 +31,16 @@
 import config
 import audio
 import event
-
+import music
+import musicPackages
 
 
 PROGRAM_PATH = "./data/"
 PROGRAM_PREFIX = "program_"
 PROGRAM_SUFFIX = ".json"
 
+musicPackageManager = musicPackages.MusicPackageManager.get_instance()
+
 def get_cam():
     return camera.Camera.get_instance()
 
@@ -56,6 +59,9 @@ def get_prog_eng():
 def get_event():
     return event.EventManager.get_instance()
 
+def get_music():
+    return music.Music.get_instance(musicPackageManager)
+
 class ProgramEngine:
 
     # pylint: disable=exec-used