Skip to content

Develop #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ucswift merged 3 commits into from
Jan 29, 2026
Merged

Develop #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
82f9128
RR-T40 Fixing issues with steams and voice.
ucswift Jan 28, 2026
33c8608
RR-T40 Minor fix
ucswift Jan 28, 2026
cb6aa75
RR-T40 PR#102 fixes
ucswift Jan 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/components/audio-stream/audio-stream-bottom-sheet.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,4 +245,3 @@ export const AudioStreamBottomSheet = () => {
</Actionsheet>
);
};

23 changes: 12 additions & 11 deletions src/components/livekit/livekit-bottom-sheet.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ export const LiveKitBottomSheet = () => {
const { trackEvent } = useAnalytics();

const [currentView, setCurrentView] = useState<BottomSheetView>(BottomSheetView.ROOM_SELECT);
const [previousView, setPreviousView] = useState<BottomSheetView>(BottomSheetView.ROOM_SELECT);
const [isMuted, setIsMuted] = useState(true); // Default to muted
const [permissionsRequested, setPermissionsRequested] = useState(false);

Expand Down Expand Up @@ -181,12 +182,15 @@ export const LiveKitBottomSheet = () => {
}, [disconnectFromRoom]);

const handleShowAudioSettings = useCallback(() => {
if (currentView !== BottomSheetView.AUDIO_SETTINGS) {
setPreviousView(currentView);
}
setCurrentView(BottomSheetView.AUDIO_SETTINGS);
}, []);
}, [currentView]);

const handleBackFromAudioSettings = useCallback(() => {
setCurrentView(BottomSheetView.CONNECTED);
}, []);
setCurrentView(previousView);
}, [previousView]);

const renderRoomSelect = () => (
<View style={styles.content}>
Expand Down Expand Up @@ -300,14 +304,12 @@ export const LiveKitBottomSheet = () => {
<ActionsheetDragIndicatorWrapper>
<ActionsheetDragIndicator />
</ActionsheetDragIndicatorWrapper>
<View className="w-full p-4">
<HStack className="mb-4 items-center justify-between">
<View className="w-full">
<HStack className="mb-2 items-center justify-between px-4 pt-2">
<Text className="text-xl font-bold">{t('livekit.title')}</Text>
{currentView === BottomSheetView.CONNECTED && (
<TouchableOpacity onPress={handleShowAudioSettings} testID="header-audio-settings-button">
<Headphones size={20} color="#6B7280" />
</TouchableOpacity>
)}
<TouchableOpacity onPress={handleShowAudioSettings} testID="header-audio-settings-button">
<Headphones size={20} color="#6B7280" />
</TouchableOpacity>
</HStack>

<View className="min-h-[400px]" testID="bottom-sheet-content">
Expand All @@ -323,7 +325,6 @@ const styles = StyleSheet.create({
content: {
flex: 1,
width: '100%',
paddingHorizontal: 16,
},
roomList: {
flex: 1,
Expand Down
2 changes: 0 additions & 2 deletions src/components/personnel/personnel-card.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ import { HStack } from '../ui/hstack';
import { Text } from '../ui/text';
import { VStack } from '../ui/vstack';



interface PersonnelCardProps {
personnel: PersonnelInfoResultData;
onPress: (id: string) => void;
Expand Down
14 changes: 11 additions & 3 deletions src/components/settings/audio-device-selection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,17 @@ export const AudioDeviceSelection: React.FC<AudioDeviceSelectionProps> = ({ show
);
};

const availableMicrophones = availableAudioDevices.filter((device) => (device.type === 'bluetooth' ? device.isAvailable : true));

const availableSpeakers = availableAudioDevices.filter((device) => device.isAvailable);
const availableMicrophones = availableAudioDevices.filter((device) => {
// Microphones include bluetooth, wired, and default input devices
// Specifially exclude devices that are explicitly speakers
return device.type === 'bluetooth' || device.type === 'wired' || device.type === 'default';
});

const availableSpeakers = availableAudioDevices.filter((device) => {
// Speakers include bluetooth, wired, speaker, and default output devices
// Specifically exclude default microphone if it somehow gets tagged as output, though usually default output is 'speaker' or 'default'
return (device.type === 'bluetooth' || device.type === 'wired' || device.type === 'speaker' || device.type === 'default') && device.id !== 'default-mic';
});

return (
<ScrollView className="flex-1">
Expand Down
41 changes: 26 additions & 15 deletions src/stores/app/audio-stream-store.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ interface AudioStreamState {
// Stream operations
fetchAvailableStreams: () => Promise<void>;
playStream: (stream: DepartmentAudioResultStreamData) => Promise<void>;
stopStream: () => Promise<void>;
stopStream: (clearState?: boolean) => Promise<void>;
cleanup: () => Promise<void>;
}

Expand Down Expand Up @@ -79,13 +79,18 @@ export const useAudioStreamStore = create<AudioStreamState>((set, get) => ({
try {
const { soundObject: currentSound, stopStream } = get();

// Stop current stream if playing
// Optimistically set the current stream and loading state
set({
currentStream: stream,
isLoading: true,
isBuffering: true,
});

// Stop current stream if playing, but don't clear the state since we just set it
if (currentSound) {
await stopStream();
await stopStream(false);
}

set({ isLoading: true, isBuffering: true });

logger.debug({
message: 'Starting audio stream',
context: { streamName: stream.Name, streamUrl: stream.Url },
Expand Down Expand Up @@ -189,12 +194,10 @@ export const useAudioStreamStore = create<AudioStreamState>((set, get) => ({
isLoading: false,
isBuffering: false,
});


}
},

stopStream: async () => {
stopStream: async (clearState = true) => {
try {
const { soundObject, currentStream } = get();

Expand All @@ -208,13 +211,21 @@ export const useAudioStreamStore = create<AudioStreamState>((set, get) => ({
});
}

set({
soundObject: null,
currentStream: null,
isPlaying: false,
isLoading: false,
isBuffering: false,
});
if (clearState) {
set({
soundObject: null,
currentStream: null,
isPlaying: false,
isLoading: false,
isBuffering: false,
});
} else {
// If not clearing state, just clear the sound object
set({
soundObject: null,
isPlaying: false,
});
}
} catch (error) {
logger.error({
message: 'Failed to stop audio stream',
Expand Down
79 changes: 50 additions & 29 deletions src/stores/app/livekit-store.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import notifee, { AndroidImportance } from '@notifee/react-native';
import { getRecordingPermissionsAsync, requestRecordingPermissionsAsync } from 'expo-audio';
import { Audio } from 'expo-av';
import { Room, RoomEvent } from 'livekit-client';
import { Platform } from 'react-native';
import { create } from 'zustand';
Expand All @@ -12,44 +13,54 @@ import { headsetButtonService } from '../../services/headset-button.service';
import { toggleMicrophone } from '../../utils/microphone-toggle';
import { useBluetoothAudioStore } from './bluetooth-audio-store';

// Helper function to setup audio routing based on selected devices
// Helper function to setup audio routing based on selected devices
const setupAudioRouting = async (room: Room): Promise<void> => {
try {
const bluetoothStore = useBluetoothAudioStore.getState();
const { selectedAudioDevices, connectedDevice } = bluetoothStore;
const { selectedAudioDevices } = bluetoothStore;
const speaker = selectedAudioDevices.speaker;
const microphone = selectedAudioDevices.microphone;

logger.info({
message: 'Setting up audio routing',
context: {
speakerType: speaker?.type,
speakerName: speaker?.name,
micType: microphone?.type,
},
});

// If we have a connected Bluetooth device, prioritize it
if (connectedDevice && connectedDevice.hasAudioCapability) {
logger.info({
message: 'Using Bluetooth device for audio routing',
context: { deviceName: connectedDevice.name },
});
if (Platform.OS === 'android' || Platform.OS === 'ios') {
// Default configuration for voice call
const audioModeConfig: any = {
allowsRecordingIOS: true,
staysActiveInBackground: true,
playsInSilentModeIOS: true,
shouldDuckAndroid: true,
// Default to earpiece unless speaker is explicitly selected
playThroughEarpieceAndroid: true,
};

// Update selected devices to use Bluetooth
const deviceName = connectedDevice.name || 'Bluetooth Device';
const bluetoothMicrophone = connectedDevice.supportsMicrophoneControl ? { id: connectedDevice.id, name: deviceName, type: 'bluetooth' as const, isAvailable: true } : selectedAudioDevices.microphone;
// If speaker device is selected (explicitly 'speaker' type), force speaker output
if (speaker?.type === 'speaker') {
logger.debug({ message: 'Routing audio to Speakerphone' });
audioModeConfig.playThroughEarpieceAndroid = false;

const bluetoothSpeaker = {
id: connectedDevice.id,
name: deviceName,
type: 'bluetooth' as const,
isAvailable: true,
};
// On iOS, we might need to handle this differently if we wanted to force speaker,
// but typically standard routing handles it or AVRoutePickerView is used.
// For Expo AV, we can sometimes influence it.
} else {
logger.debug({ message: 'Routing audio to Earpiece/Headset' });
audioModeConfig.playThroughEarpieceAndroid = true;
}

bluetoothStore.setSelectedMicrophone(bluetoothMicrophone);
bluetoothStore.setSelectedSpeaker(bluetoothSpeaker);
await Audio.setAudioModeAsync(audioModeConfig);
}

// Note: Actual audio routing would be implemented via native modules
// This is a placeholder for the audio routing logic
logger.debug({
message: 'Audio routing configured for Bluetooth device',
});
} else {
// Use default audio devices (selected devices or default)
logger.debug({
message: 'Using default audio devices',
context: { selectedAudioDevices },
});
// Handle LiveKit specific device switching if needed (mostly for web/desktop, but good to have)
if (speaker?.id && speaker.id !== 'default-speaker' && speaker.type === 'bluetooth') {
// logic for specific bluetooth device selection if feasible
}
} catch (error) {
logger.error({
Expand Down Expand Up @@ -466,3 +477,13 @@ export const useLiveKitStore = create<LiveKitState>((set, get) => ({
}
},
}));

// Subscribe to bluetooth store changes to trigger audio routing updates
useBluetoothAudioStore.subscribe((state, prevState) => {
if (state.selectedAudioDevices !== prevState.selectedAudioDevices) {
const room = useLiveKitStore.getState().currentRoom;
if (room) {
setupAudioRouting(room);
}
}
});