Update app.py

app.py

@@ -19,33 +19,29 @@ class GGWaveTransceiver:
     def __init__(self):
         self.sample_rate = 48000
         self.protocols = {
-            'Normal': ggwave.GGWAVE_PROTOCOL_AUDIBLE_NORMAL,
-            'Fast': ggwave.GGWAVE_PROTOCOL_AUDIBLE_FAST,
-            'Fastest': ggwave.GGWAVE_PROTOCOL_AUDIBLE_FASTEST,
-            'Ultrasonic': ggwave.GGWAVE_PROTOCOL_ULTRASONIC_NORMAL,
-            'DT (Data Transfer)': ggwave.GGWAVE_PROTOCOL_DT_NORMAL,
+            'Normal': 0,          # Normal audible
+            'Fast': 1,            # Fast audible  
+            'Fastest': 2,         # Fastest audible
+            'Ultrasonic Normal': 3,  # Ultrasonic normal
+            'Ultrasonic Fast': 4,    # Ultrasonic fast
+            'Ultrasonic Fastest': 5, # Ultrasonic fastest
+            'DT Normal': 6,       # Data Transfer normal
+            'DT Fast': 7,         # Data Transfer fast
+            'DT Fastest': 8,      # Data Transfer fastest
         }
-    
+        
     def encode_text_to_audio(self, text, protocol='Normal', volume=50):
         """Encode text to audio using ggwave"""
         try:
-            protocol_id = self.protocols.get(protocol, ggwave.GGWAVE_PROTOCOL_AUDIBLE_NORMAL)
+            protocol_id = self.protocols.get(protocol, 0)
             
-            # Create ggwave instance
-            instance = ggwave.GGWave(
-                sample_rate=self.sample_rate,
-                samples_per_frame=1024,
-                sound_marker_threshold=0.1,
-                marker_duration=0.2
-            )
-            
-            # Encode text to audio
-            audio_data = instance.encode(text.encode('utf-8'), protocol_id, volume)
+            # Use the simple ggwave.encode function
+            audio_data = ggwave.encode(text, protocolId=protocol_id, volume=volume)
             
             if audio_data is None:
                 return None, "Failed to encode text"
             
-            # Convert to numpy array
+            # Convert bytes to numpy array (ggwave returns raw bytes)
             audio_array = np.frombuffer(audio_data, dtype=np.float32)
             
             # Create temporary WAV file
@@ -78,21 +74,35 @@ class GGWaveTransceiver:
                 # Convert to float32
                 audio_float = audio_data.astype(np.float32) / 32767.0
             
-            # Create ggwave instance
-            instance = ggwave.GGWave(
-                sample_rate=self.sample_rate,
-                samples_per_frame=1024,
-                sound_marker_threshold=0.1,
-                marker_duration=0.2
-            )
+            # Initialize ggwave instance for decoding
+            instance = ggwave.init()
             
-            # Decode audio
-            decoded = instance.decode(audio_float.tobytes())
-            
-            if decoded:
-                return f"Decoded message: {decoded.decode('utf-8')}"
-            else:
-                return "No valid ggwave signal detected in audio"
+            try:
+                # Decode audio in chunks
+                chunk_size = 1024
+                decoded_text = None
+                
+                for i in range(0, len(audio_float), chunk_size):
+                    chunk = audio_float[i:i+chunk_size]
+                    
+                    # Convert chunk to bytes for ggwave
+                    chunk_bytes = chunk.astype(np.float32).tobytes()
+                    
+                    # Try to decode this chunk
+                    result = ggwave.decode(instance, chunk_bytes)
+                    
+                    if result is not None:
+                        decoded_text = result.decode('utf-8')
+                        break
+                
+                if decoded_text:
+                    return f"Decoded message: {decoded_text}"
+                else:
+                    return "No valid ggwave signal detected in audio"
+                    
+            finally:
+                # Clean up the instance
+                ggwave.free(instance)
                 
         except Exception as e:
             return f"Error decoding: {str(e)}"
@@ -117,8 +127,30 @@ def decode_audio(audio_file):
 def create_demo_audio():
     """Create a demo audio file"""
     demo_text = "Hello from ggwave!"
-    audio_file, _ = transceiver.encode_text_to_audio(demo_text, 'Normal', 50)
-    return audio_file
+    try:
+        # Use the simple ggwave.encode function directly
+        audio_data = ggwave.encode(demo_text, protocolId=0, volume=50)
+        
+        if audio_data is None:
+            return None
+        
+        # Convert to numpy array and create WAV file
+        audio_array = np.frombuffer(audio_data, dtype=np.float32)
+        
+        with tempfile.NamedTemporaryFile(suffix='.wav', delete=False) as tmp_file:
+            with wave.open(tmp_file.name, 'w') as wav_file:
+                wav_file.setnchannels(1)
+                wav_file.setsampwidth(2)
+                wav_file.setframerate(48000)
+                
+                # Convert float32 to int16
+                audio_int16 = (audio_array * 32767).astype(np.int16)
+                wav_file.writeframes(audio_int16.tobytes())
+            
+            return tmp_file.name
+    except Exception as e:
+        print(f"Error creating demo: {e}")
+        return None
 
 # Phone integration helper functions
 def get_twilio_webhook_code():