try again

Author: Josh-XT

lib/services/ai_service.dart

@@ -151,11 +151,19 @@ class AIService {
 
   /// Handle voice input state changes
   void _handleVoiceInputState(VoiceInputState state) {
-    debugPrint('AIService: Voice input state: ${state.status}');
+    debugPrint('AIService: Voice input state: ${state.status}, hasAudio: ${state.audioData != null}');
 
-    if (state.status == VoiceInputStatus.complete && state.audioData != null) {
+    // Process audio when recording completes with audio data
+    if ((state.status == VoiceInputStatus.complete || 
+         state.status == VoiceInputStatus.stopped) && 
+        state.audioData != null) {
       // Process the recorded audio
       _processRecordedAudio(state.audioData!, state.source);
+    } else if (state.status == VoiceInputStatus.stopped && state.audioData == null) {
+      // Recording stopped but no audio captured
+      debugPrint('AIService: Recording stopped with no audio data');
+      _isProcessing = false;
+      _showErrorMessage('No audio captured');
     }
   }
 

lib/services/voice_input_service.dart

@@ -1,10 +1,11 @@
 import 'dart:async';
 import 'dart:typed_data';
 import 'package:agixt/services/bluetooth_manager.dart';
+import 'package:agixt/services/bluetooth_reciever.dart';
 import 'package:agixt/services/watch_service.dart';
 import 'package:agixt/services/wake_word_service.dart';
+import 'package:agixt/utils/lc3.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/services.dart';
 import 'package:flutter_sound/flutter_sound.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:shared_preferences/shared_preferences.dart';
@@ -33,10 +34,8 @@ class VoiceInputService {
   final FlutterSoundRecorder _recorder = FlutterSoundRecorder();
   bool _recorderInitialized = false;
 
-  // Method channel for glasses microphone
-  static const MethodChannel _glassesAudioChannel = MethodChannel(
-    'dev.agixt.agixt/glasses_audio',
-  );
+  // Bluetooth receiver for glasses audio
+  final BluetoothReciever _bluetoothReciever = BluetoothReciever.singleton;
 
   // State
   bool _isRecording = false;
@@ -75,8 +74,8 @@ class VoiceInputService {
     // Initialize phone recorder
     await _initializeRecorder();
 
-    // Set up glasses audio callback
-    _glassesAudioChannel.setMethodCallHandler(_handleGlassesAudioCall);
+    // Note: Glasses audio is handled by BluetoothReciever.voiceCollectorAI
+    // No additional setup needed here
 
     // Note: Wake word callback is handled by AIService which coordinates
     // the full flow (recording -> transcription -> AGiXT -> response)
@@ -99,29 +98,9 @@ class VoiceInputService {
     }
   }
 
-  /// Handle method calls from native glasses audio code
-  Future<dynamic> _handleGlassesAudioCall(MethodCall call) async {
-    switch (call.method) {
-      case 'onAudioData':
-        final audioData = call.arguments['audioData'] as Uint8List?;
-        if (audioData != null &&
-            _isRecording &&
-            _activeSource == VoiceInputSource.glasses) {
-          _audioChunkController.add(audioData);
-        }
-        return true;
-
-      case 'onRecordingComplete':
-        final audioData = call.arguments['audioData'] as Uint8List?;
-        if (_isRecording && _activeSource == VoiceInputSource.glasses) {
-          await _handleRecordingComplete(audioData);
-        }
-        return true;
-
-      default:
-        return null;
-    }
-  }
+  // Note: Glasses audio is collected by BluetoothReciever.voiceCollectorAI
+  // when the mic is enabled. We get the data via getAllDataAndReset() in
+  // _stopGlassesRecording().
 
   // Note: Wake word detection is handled by AIService which listens to
   // WakeWordService.eventStream and coordinates the full voice input flow.
@@ -235,19 +214,26 @@ class VoiceInputService {
   /// Start recording from glasses microphone
   Future<bool> _startGlassesRecording(Duration maxDuration) async {
     try {
+      // Reset voice collector buffer before starting
+      _bluetoothReciever.voiceCollectorAI.reset();
+      _bluetoothReciever.voiceCollectorAI.isRecording = true;
+      
       // Enable microphone on glasses
       await _bluetoothManager.setMicrophone(true);
+      debugPrint('VoiceInputService: Glasses mic enabled, recording started');
 
       // Set up auto-stop timer
       Timer(maxDuration, () {
         if (_isRecording && _activeSource == VoiceInputSource.glasses) {
+          debugPrint('VoiceInputService: Auto-stopping glasses recording after $maxDuration');
           stopRecording();
         }
       });
 
       return true;
     } catch (e) {
       debugPrint('VoiceInputService: Error starting glasses recording: $e');
+      _bluetoothReciever.voiceCollectorAI.isRecording = false;
       return false;
     }
   }
@@ -337,11 +323,13 @@ class VoiceInputService {
     final source = _activeSource;
     _activeSource = null;
 
+    // Use 'complete' status when we have audio data so AIService processes it
     _stateController.add(
       VoiceInputState(
         isRecording: false,
         source: source,
-        status: VoiceInputStatus.stopped,
+        status: audioData != null ? VoiceInputStatus.complete : VoiceInputStatus.stopped,
+        audioData: audioData,
       ),
     );
 
@@ -356,18 +344,33 @@ class VoiceInputService {
   /// Stop glasses recording
   Future<Uint8List?> _stopGlassesRecording() async {
     try {
+      // Stop recording and disable mic
+      _bluetoothReciever.voiceCollectorAI.isRecording = false;
       await _bluetoothManager.setMicrophone(false);
 
-      // Get recorded audio from native code
-      final result = await _glassesAudioChannel.invokeMethod(
-        'getRecordedAudio',
-      );
-      if (result is Uint8List) {
-        return result;
+      // Get all collected voice data (LC3 encoded)
+      final lc3Data = await _bluetoothReciever.voiceCollectorAI.getAllDataAndReset();
+      
+      if (lc3Data.isEmpty) {
+        debugPrint('VoiceInputService: No voice data collected from glasses');
+        return null;
       }
-      return null;
+      
+      debugPrint('VoiceInputService: Got ${lc3Data.length} bytes of LC3 data from glasses');
+      
+      // Decode LC3 to PCM
+      final pcmData = await LC3.decodeLC3(Uint8List.fromList(lc3Data));
+      
+      if (pcmData.isEmpty) {
+        debugPrint('VoiceInputService: LC3 decode returned empty PCM data');
+        return null;
+      }
+      
+      debugPrint('VoiceInputService: Decoded to ${pcmData.length} bytes of PCM audio');
+      return pcmData;
     } catch (e) {
       debugPrint('VoiceInputService: Error stopping glasses recording: $e');
+      _bluetoothReciever.voiceCollectorAI.isRecording = false;
       return null;
     }
   }