4 movements only

app.py

@@ -83,7 +83,7 @@ def get_movement_sounds() -> Dict[str, str]:
     """Get the current sound files for each movement."""
     sounds = {}
     for movement, sound_file in sound_manager.current_sound_mapping.items():
-        if movement in ['left_hand', 'right_hand', 'left_leg', "right_leg", 'tongue']:  # Only show main movements
+        if movement in ['left_hand', 'right_hand', 'left_leg', "right_leg"]:  # Only show main movements
             if sound_file is not None:  # Check if sound_file is not None
                 sound_path = sound_manager.sound_dir / sound_file
                 if sound_path.exists():
@@ -123,19 +123,28 @@ def start_composition():
     # Process classification
     result = sound_manager.process_classification(predicted_name, confidence, CONFIDENCE_THRESHOLD)
 
+    # Debug: Print composition layers before DJ mode transition
+    print(f"DEBUG: composition_layers before DJ check: {[layer['sound_file'] for layer in sound_manager.composition_layers]}")
     # Always check for DJ mode transition after classification
     dj_transitioned = sound_manager.transition_to_dj_phase()
     print(f"DEBUG: DJ mode transitioned: {dj_transitioned}, current_phase: {sound_manager.current_phase}")
 
-    # Create visualization
-    fig = create_eeg_plot(epoch_data, target_movement, predicted_name, confidence, result['sound_added'])
+    # Stop EEG visualization if all 4 unique sound layers are present
+    unique_sounds = set([layer['sound_file'] for layer in sound_manager.composition_layers if layer.get('sound_file')])
+    if len(unique_sounds) >= 4 and sound_manager.current_phase != "dj_effects":
+        fig = None
+        print("DEBUG: EEG visualization stopped (all sounds present)")
+    else:
+        fig = create_eeg_plot(epoch_data, target_movement, predicted_name, confidence, result['sound_added'])
+        if sound_manager.current_phase == "dj_effects":
+            print("DEBUG: EEG visualization restarted for DJ mode")
     
     # Initialize all audio components to None (no sound by default)
     left_hand_audio = None
     right_hand_audio = None
     left_leg_audio = None
     right_leg_audio = None
-    tongue_audio = None
+    #tongue_audio = None
     
     # Debug: Print classification result
     print(f"DEBUG start_composition: predicted={predicted_name}, confidence={confidence:.3f}, sound_added={result['sound_added']}")
@@ -156,9 +165,9 @@ def start_composition():
         elif predicted_name == 'right_leg' and 'right_leg' in sounds:
             right_leg_audio = sounds['right_leg']
             print(f"DEBUG: Setting right_leg_audio to {sounds['right_leg']}")
-        elif predicted_name == 'tongue' and 'tongue' in sounds:
-            tongue_audio = sounds['tongue']
-            print(f"DEBUG: Setting tongue_audio to {sounds['tongue']}")
+        # elif predicted_name == 'tongue' and 'tongue' in sounds:
+        #     tongue_audio = sounds['tongue']
+        #     print(f"DEBUG: Setting tongue_audio to {sounds['tongue']}")
     else:
         print("DEBUG: No sound added - confidence too low or other issue")
     
@@ -187,7 +196,7 @@ def start_composition():
         right_hand_audio, 
         left_leg_audio,
         right_leg_audio,
-        tongue_audio,
+        #tongue_audio,
         status_text
     )
 
@@ -286,7 +295,7 @@ def start_automatic_composition():
     right_hand_audio = None
     left_leg_audio = None
     right_leg_audio = None
-    tongue_audio = None
+    #tongue_audio = None
     
     # Debug: Print classification result
     print(f"DEBUG start_automatic_composition: predicted={predicted_name}, confidence={confidence:.3f}, sound_added={result['sound_added']}")
@@ -311,9 +320,9 @@ def start_automatic_composition():
         if 'right_leg' in completed_movements and 'right_leg' in sounds:
             right_leg_audio = sounds['right_leg']
             print(f"DEBUG DJ: Right leg playing: {sounds['right_leg']}")
-        if 'tongue' in completed_movements and 'tongue' in sounds:
-            tongue_audio = sounds['tongue']
-            print(f"DEBUG DJ: Tongue playing: {sounds['tongue']}")
+        # if 'tongue' in completed_movements and 'tongue' in sounds:
+        #     tongue_audio = sounds['tongue']
+        #     print(f"DEBUG DJ: Tongue playing: {sounds['tongue']}")
         print(f"DEBUG DJ: {len(completed_movements)} individual sounds playing with effects applied")
     else:
         # Building Phase - create and show layered composition
@@ -340,9 +349,9 @@ def start_automatic_composition():
             if 'right_leg' in completed_movements and 'right_leg' in sounds:
                 right_leg_audio = sounds['right_leg']
                 print(f"DEBUG: Right leg playing: {sounds['right_leg']}")
-            if 'tongue' in completed_movements and 'tongue' in sounds:
-                tongue_audio = sounds['tongue']
-                print(f"DEBUG: Tongue playing: {sounds['tongue']}")
+            # if 'tongue' in completed_movements and 'tongue' in sounds:
+            #     tongue_audio = sounds['tongue']
+            #     print(f"DEBUG: Tongue playing: {sounds['tongue']}")
                 
             print(f"DEBUG: {len(completed_movements)} individual sounds will play together creating layered composition")
     
@@ -393,7 +402,7 @@ def start_automatic_composition():
         right_hand_audio, 
         left_leg_audio,
         right_leg_audio,
-        tongue_audio,
+        #tongue_audio,
         status_text,
         gr.update(visible=building_visible),  # building_instructions
         gr.update(visible=dj_visible)         # dj_instructions
@@ -433,7 +442,7 @@ def manual_classify():
     right_hand_audio = sounds.get('right_hand', None)
     left_leg_audio = sounds.get('left_leg', None)
     right_leg_audio = sounds.get('right_leg', None)
-    tongue_audio = sounds.get('tongue', None)
+    #tongue_audio = sounds.get('tongue', None)
     
     return (
         target_text,
@@ -445,7 +454,7 @@ def manual_classify():
         right_hand_audio,
         left_leg_audio,
         right_leg_audio,
-        tongue_audio
+        #tongue_audio
     )
 
 def clear_manual():
@@ -553,7 +562,7 @@ def continue_automatic_composition():
     right_hand_audio = None
     left_leg_audio = None
     right_leg_audio = None
-    tongue_audio = None
+    #tongue_audio = None
     
     # Handle audio differently based on phase
     if sound_manager.current_phase == "dj_effects":
@@ -565,7 +574,7 @@ def continue_automatic_composition():
         right_hand_audio = None
         left_leg_audio = None
         right_leg_audio = None
-        tongue_audio = None
+        #tongue_audio = None
         # The mixed_track will be shown in a dedicated gr.Audio component in the UI (update UI accordingly)
     else:
         # Building Mode: Display individual sounds in their respective players for layered composition
@@ -591,9 +600,9 @@ def continue_automatic_composition():
             if 'right_leg' in completed_movements and 'right_leg' in sounds:
                 right_leg_audio = sounds['right_leg']
                 print(f"DEBUG continue: Right leg playing: {sounds['right_leg']}")
-            if 'tongue' in completed_movements and 'tongue' in sounds:
-                tongue_audio = sounds['tongue']
-                print(f"DEBUG continue: Tongue playing: {sounds['tongue']}")
+            # if 'tongue' in completed_movements and 'tongue' in sounds:
+            #     tongue_audio = sounds['tongue']
+            #     print(f"DEBUG continue: Tongue playing: {sounds['tongue']}")
                 
             print(f"DEBUG continue: {len(completed_movements)} individual sounds will play together creating layered composition")
     
@@ -633,7 +642,7 @@ def continue_automatic_composition():
         right_hand_audio, 
         left_leg_audio,
         right_leg_audio,
-        tongue_audio,
+        #tongue_audio,
         status_text,
         gr.update(visible=building_visible),  # building_instructions
         gr.update(visible=dj_visible)         # dj_instructions
@@ -682,7 +691,7 @@ def classify_epoch():
     right_hand_audio = None
     left_leg_audio = None
     right_leg_audio = None
-    tongue_audio = None
+    #tongue_audio = None
     
     # Always assign all completed movement sounds to their respective audio slots
     sounds = get_movement_sounds()
@@ -695,8 +704,8 @@ def classify_epoch():
         left_leg_audio = sounds['left_leg']
     if 'right_leg' in completed_movements and 'right_leg' in sounds:
         right_leg_audio = sounds['right_leg']
-    if 'tongue' in completed_movements and 'tongue' in sounds:
-        tongue_audio = sounds['tongue']
+    # if 'tongue' in completed_movements and 'tongue' in sounds:
+    #     tongue_audio = sounds['tongue']
     
     # Format next target
     next_target = sound_manager.get_current_target_movement()
@@ -717,7 +726,7 @@ def classify_epoch():
         right_hand_audio, 
         left_leg_audio,
         right_leg_audio,
-        tongue_audio,
+        ##tongue_audio,
         status_text
     )
 
@@ -784,8 +793,6 @@ def create_interface():
                             **Motor Imagery Training:**
                             - **Imagine** opening or closing your **right or left hand**
                             - **Visualize** briefly moving your **right or left leg or foot**  
-                            - **Think about** pronouncing **"L"** with your tongue
-                            - **Rest state** (no movement imagination)
                             
                             *🌟 Each successful imagination creates a musical layer!*
                             
@@ -804,7 +811,7 @@ def create_interface():
                             - 👉 **Right Hand**: High Pass Filter On/Off  
                             - 🦵 **Left Leg**: Reverb Effect On/Off
                             - 🦵 **Right Leg**: Low Pass Filter On/Off
-                            - 👅 **Tongue**: Bass Boost On/Off
+                            
                             
                             *🎛️ Each movement toggles an effect - Mix your creation!*
                             """)
@@ -845,7 +852,7 @@ def create_interface():
                         right_hand_sound = gr.Audio(label="👉 Right Hand", interactive=False, autoplay=True, visible=True) 
                         left_leg_sound = gr.Audio(label="🦵 Left Leg", interactive=False, autoplay=True, visible=True)
                         right_leg_sound = gr.Audio(label="🦵 Right Leg", interactive=False, autoplay=True, visible=True)
-                        tongue_sound = gr.Audio(label="👅 Tongue", interactive=False, autoplay=True, visible=True)
+                        #tongue_sound = gr.Audio(label="👅 Tongue", interactive=False, autoplay=True, visible=True)
                         
                         # Composition status
                         composition_status = gr.Textbox(label="Composition Status", interactive=False, lines=5)
@@ -878,7 +885,7 @@ def create_interface():
                         manual_right_hand_sound = gr.Audio(label="👉 Right Hand", interactive=False, autoplay=False, visible=True)
                         manual_left_leg_sound = gr.Audio(label="🦵 Left Leg", interactive=False, autoplay=False, visible=True)
                         manual_right_leg_sound = gr.Audio(label="🦵 Right Leg", interactive=False, autoplay=False, visible=True)
-                        manual_tongue_sound = gr.Audio(label="👅 Tongue", interactive=False, autoplay=False, visible=True)
+                        #manual_tongue_sound = gr.Audio(label="👅 Tongue", interactive=False, autoplay=False, visible=True)
         
         # Session management functions
         def start_new_session():
@@ -901,10 +908,10 @@ def create_interface():
                 result[6],  # right_hand_sound
                 result[7],  # left_leg_sound
                 result[8],  # right_leg_sound
-                result[9],  # tongue_sound
-                result[10], # composition_status
-                result[11], # building_instructions
-                result[12], # dj_instructions
+                #result[9],  # tongue_sound
+                result[9],  # composition_status
+                result[10], # building_instructions
+                result[11], # dj_instructions
                 gr.update(visible=True),   # continue_btn - show it
                 gr.update(active=True),    # timer - activate it
                 gr.update(visible=False)   # session_complete_row - hide it
@@ -926,10 +933,10 @@ def create_interface():
                 result[6],  # right_hand_sound
                 result[7],  # left_leg_sound
                 result[8],  # right_leg_sound
-                result[9],  # tongue_sound
-                result[10], # composition_status
-                result[11], # building_instructions
-                result[12], # dj_instructions
+                #result[9],  # tongue_sound
+                result[9],  # composition_status
+                result[10], # building_instructions
+                result[11], # dj_instructions
                 gr.update(visible=True),   # continue_btn - show it
                 gr.update(active=True),    # timer - activate it
                 gr.update(visible=False)   # session_complete_row - hide it
@@ -950,10 +957,10 @@ def create_interface():
                 result[6],  # right_hand_sound
                 result[7],  # left_leg_sound
                 result[8],  # right_leg_sound
-                result[9],  # tongue_sound
-                result[10], # composition_status
-                result[11], # building_instructions
-                result[12], # dj_instructions
+                #result[9],  # tongue_sound
+                result[9], # composition_status
+                result[10], # building_instructions
+                result[11], # dj_instructions
                 gr.update(visible=True),  # continue_btn - show it
                 gr.update(active=True)    # timer - activate it
             )
@@ -975,10 +982,10 @@ def create_interface():
                     result[6],  # right_hand_sound
                     result[7],  # left_leg_sound
                     result[8],  # right_leg_sound
-                    result[9],  # tongue_sound
-                    result[10], # composition_status
-                    result[11], # building_instructions
-                    result[12], # dj_instructions  
+                    #result[9],  # tongue_sound
+                    result[9], # composition_status
+                    result[10], # building_instructions
+                    result[11], # dj_instructions
                     gr.update(active=False),  # timer - deactivate it
                     gr.update(visible=True)   # session_complete_row - show options
                 )
@@ -995,10 +1002,10 @@ def create_interface():
                     result[6],  # right_hand_sound
                     result[7],  # left_leg_sound
                     result[8],  # right_leg_sound
-                    result[9],  # tongue_sound
-                    result[10], # composition_status
-                    result[11], # building_instructions
-                    result[12], # dj_instructions
+                    #result[9],  # tongue_sound
+                    result[9], # composition_status
+                    result[10], # building_instructions
+                    result[11], # dj_instructions
                     gr.update(active=False),  # timer - deactivate it
                     gr.update(visible=False)  # session_complete_row - keep hidden
                 )
@@ -1014,10 +1021,10 @@ def create_interface():
                     result[6],  # right_hand_sound
                     result[7],  # left_leg_sound
                     result[8],  # right_leg_sound
-                    result[9],  # tongue_sound
-                    result[10], # composition_status
-                    result[11], # building_instructions
-                    result[12], # dj_instructions
+                    #result[9],  # tongue_sound
+                    result[9], # composition_status
+                    result[10], # building_instructions
+                    result[11], # dj_instructions
                     gr.update(active=True),   # timer - keep active
                     gr.update(visible=False)  # session_complete_row - keep hidden
                 )
@@ -1026,14 +1033,14 @@ def create_interface():
         start_btn.click(
             fn=start_with_timer,
             outputs=[target_display, predicted_display, timer_display, user_prompt, eeg_plot,
-                    left_hand_sound, right_hand_sound, left_leg_sound, right_leg_sound, tongue_sound, composition_status,
+                    left_hand_sound, right_hand_sound, left_leg_sound, right_leg_sound, composition_status,
                     building_instructions, dj_instructions, continue_btn, timer]
         )
         
         continue_btn.click(
             fn=continue_with_timer,
             outputs=[target_display, predicted_display, timer_display, user_prompt, eeg_plot,
-                    left_hand_sound, right_hand_sound, left_leg_sound, right_leg_sound, tongue_sound, composition_status,
+                    left_hand_sound, right_hand_sound, left_leg_sound, right_leg_sound, composition_status,
                     building_instructions, dj_instructions, timer, session_complete_row]
         )
         
@@ -1041,7 +1048,7 @@ def create_interface():
         timer.tick(
             fn=continue_with_timer,
             outputs=[target_display, predicted_display, timer_display, user_prompt, eeg_plot,
-                    left_hand_sound, right_hand_sound, left_leg_sound, right_leg_sound, tongue_sound, composition_status,
+                    left_hand_sound, right_hand_sound, left_leg_sound, right_leg_sound, composition_status,
                     building_instructions, dj_instructions, timer, session_complete_row]
         )
         
@@ -1049,14 +1056,14 @@ def create_interface():
         new_session_btn.click(
             fn=start_new_session,
             outputs=[target_display, predicted_display, timer_display, user_prompt, eeg_plot,
-                    left_hand_sound, right_hand_sound, left_leg_sound, right_leg_sound, tongue_sound, composition_status,
+                    left_hand_sound, right_hand_sound, left_leg_sound, right_leg_sound, composition_status,
                     building_instructions, dj_instructions, continue_btn, timer, session_complete_row]
         )
         
         extend_session_btn.click(
             fn=extend_current_session,
             outputs=[target_display, predicted_display, timer_display, user_prompt, eeg_plot,
-                    left_hand_sound, right_hand_sound, left_leg_sound, right_leg_sound, tongue_sound, composition_status,
+                    left_hand_sound, right_hand_sound, left_leg_sound, right_leg_sound, composition_status,
                     building_instructions, dj_instructions, continue_btn, timer, session_complete_row]
         )
         
@@ -1081,13 +1088,13 @@ def create_interface():
         classify_btn.click(
             fn=manual_classify,
             outputs=[manual_target_display, manual_predicted_display, manual_timer_display, manual_eeg_plot, manual_results,
-                    manual_left_hand_sound, manual_right_hand_sound, manual_left_leg_sound, manual_right_leg_sound, manual_tongue_sound]
+                    manual_left_hand_sound, manual_right_hand_sound, manual_left_leg_sound, manual_right_leg_sound]
         )
         
         clear_btn.click(
             fn=clear_manual,
             outputs=[manual_target_display, manual_predicted_display, manual_timer_display, manual_eeg_plot, manual_results,
-                    manual_left_hand_sound, manual_right_hand_sound, manual_left_leg_sound, manual_right_leg_sound, manual_tongue_sound] 
+                    manual_left_hand_sound, manual_right_hand_sound, manual_left_leg_sound, manual_right_leg_sound] 
         )
         
         # Note: No auto-loading of sounds to prevent playing all sounds on startup

sound_library.py

@@ -103,7 +103,7 @@ class AudioEffectsProcessor:
         """Apply bass boost using low-frequency shelving filter."""
         try:
             # Design low-shelf filter for bass boost
-            freq = 250.0  # Bass frequency cutoff
+            freq = 200.0  # Bass frequency cutoff
             nyquist = samplerate / 2
             normalized_freq = freq / nyquist
             
@@ -177,67 +177,74 @@ class SoundManager:
     """
     
     def __init__(self, sound_dir: str = "sounds", include_neutral_in_cycle: bool = False):
-        self.sound_dir = Path(sound_dir)
-        self.include_neutral_in_cycle = include_neutral_in_cycle
-        
-        # Composition state
-        self.composition_layers = []  # All layers across all cycles
-        self.current_cycle = 0
-        self.current_step = 0  # Current step within cycle (0-5)
-        self.cycle_complete = False
-        self.completed_cycles = 0  # Track completed cycles for session management
-        self.max_cycles = 2  # Rehabilitation session limit
-        
-        # DJ Effects phase management
-        self.current_phase = "building"  # "building" or "dj_effects"
-        self.mixed_composition_file = None  # Path to current mixed composition
-        self.active_effects = {  # Track which effects are currently active
-            "left_hand": False,    # Volume fade
-            "right_hand": False,   # Filter sweep
-            "left_leg": False,     # Reverb
-            "right_leg": False,    # Tempo modulation  
-            "tongue": False        # Bass boost
-        }
-        
-        # All possible movements (neutral is optional for composition)
-        self.all_movements = ["left_hand", "right_hand", "neutral", "left_leg", "tongue", "right_leg"]
-        
-        # Active movements that contribute to composition (excluding neutral)
-        self.active_movements = ["left_hand", "right_hand", "left_leg", "tongue", "right_leg"]
-        
-        # Current cycle's random movement sequence (shuffled each cycle)
-        self.current_movement_sequence = []
-        self.movements_completed = set()  # Track which movements have been successfully completed
-        self._generate_new_sequence()
-        
-        # User-customizable sound mapping (can be updated after each cycle)
-        self.current_sound_mapping = {
-            "left_hand": "1_SoundHelix-Song-6_(Bass).wav",
-            "right_hand": "1_SoundHelix-Song-6_(Drums).wav", 
-            "neutral": None,  # No sound for neutral/rest state
-            "left_leg": "1_SoundHelix-Song-6_(Other).wav",
-            "tongue": "1_SoundHelix-Song-6_(Vocals).wav",
-            "right_leg": "1_SoundHelix-Song-6_(Bass).wav"  # Can be remapped
-        }
-        
-        # Available sound files
-        self.available_sounds = [
-            "1_SoundHelix-Song-6_(Bass).wav",
-            "1_SoundHelix-Song-6_(Drums).wav", 
-            "1_SoundHelix-Song-6_(Other).wav",
-            "1_SoundHelix-Song-6_(Vocals).wav"
-        ]
-        
-        # Load sound files
-        self.loaded_sounds = {}
-        self._load_sound_files()
-        
-        # Cycle statistics
-        self.cycle_stats = {
-            'total_cycles': 0,
-            'successful_classifications': 0,
-            'total_attempts': 0
-        }
+            # Available sound files (define FIRST)
+            self.available_sounds = [
+                "1_SoundHelix-Song-6_(Bass).wav",
+                "1_SoundHelix-Song-6_(Drums).wav", 
+                "1_SoundHelix-Song-6_(Other).wav",
+                "1_SoundHelix-Song-6_(Vocals).wav"
+            ]
+
+            self.sound_dir = Path(sound_dir)
+            self.include_neutral_in_cycle = include_neutral_in_cycle
+            
+            # Composition state
+            self.composition_layers = []  # All layers across all cycles
+            self.current_cycle = 0
+            self.current_step = 0  # Current step within cycle (0-5)
+            self.cycle_complete = False
+            self.completed_cycles = 0  # Track completed cycles for session management
+            self.max_cycles = 2  # Rehabilitation session limit
+            
+            # DJ Effects phase management
+            self.current_phase = "building"  # "building" or "dj_effects"
+            self.mixed_composition_file = None  # Path to current mixed composition
+            self.active_effects = {  # Track which effects are currently active
+                "left_hand": False,    # Volume fade
+                "right_hand": False,   # Filter sweep
+                "left_leg": False,     # Reverb
+                "right_leg": False,    # Tempo modulation  
+                #"tongue": False        # Bass boost
+            }
+        
+            # All possible movements (neutral is optional for composition)
+            self.all_movements = ["left_hand", "right_hand", "neutral", "left_leg", "tongue", "right_leg"]
+            
+            # Active movements that contribute to composition (excluding neutral)
+            self.active_movements = ["left_hand", "right_hand", "left_leg", "right_leg"]
+            
+            # Current cycle's random movement sequence (shuffled each cycle)
+            self.current_movement_sequence = []
+            self.movements_completed = set()  # Track which movements have been successfully completed
+            self._generate_new_sequence()
+            
+            # User-customizable sound mapping (can be updated after each cycle)
+            # Assign each movement a unique sound file from available_sounds
+            import random
+            movements = ["left_hand", "right_hand", "left_leg", "right_leg"]
+            sounds = self.available_sounds.copy()
+            random.shuffle(sounds)
+            self.current_sound_mapping = {movement: sound for movement, sound in zip(movements, sounds)}
+            self.current_sound_mapping["neutral"] = None  # No sound for neutral/rest state
+            
+            # Available sound files
+            self.available_sounds = [
+                "1_SoundHelix-Song-6_(Bass).wav",
+                "1_SoundHelix-Song-6_(Drums).wav", 
+                "1_SoundHelix-Song-6_(Other).wav",
+                "1_SoundHelix-Song-6_(Vocals).wav"
+            ]
+            
+            # Load sound files
+            self.loaded_sounds = {}
+            self._load_sound_files()
+            
+            # Cycle statistics
+            self.cycle_stats = {
+                'total_cycles': 0,
+                'successful_classifications': 0,
+                'total_attempts': 0
+            }
         
     def _load_sound_files(self):
         """Load all available sound files into memory."""
@@ -426,7 +433,7 @@ class SoundManager:
             print("   👉 Right Hand: High Pass Filter") 
             print("   🦵 Left Leg: Reverb Effect")
             print("   🦵 Right Leg: Low Pass Filter")
-            print("   👅 Tongue: Bass Boost")
+            #print("   👅 Tongue: Bass Boost")
             return True
         else:
             print("DEBUG: Not enough unique sounds to transition to DJ mode.")
@@ -530,7 +537,7 @@ class SoundManager:
             "right_hand": "High Pass Filter",
             "left_leg": "Reverb Effect", 
             "right_leg": "Low Pass Filter",
-            "tongue": "Bass Boost"
+            #"tongue": "Bass Boost"
         }
         effect_name = effect_names.get(movement, movement)
         print(f"🎛️ {effect_name}: {effect_status}")