paul
/
monocoque
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More support for beyond stereo

This commit is contained in:
Paul Dino Jones 2024-07-22 21:45:57 -04:00
parent d581e3eeab
commit 3ab4e69d64
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/monocoque/devices/sound/usb_generic_shaker_pulse.c
View File

@ -105,13 +105,28 @@ int usb_generic_shaker_init(SoundDevice* sounddevice, pa_threaded_mainloop* main
pa_channel_map channel_map; pa_channel_map channel_map;
pa_channel_map_init_auto(&channel_map, channels, PA_CHANNEL_MAP_DEFAULT); pa_channel_map_init_auto(&channel_map, channels, PA_CHANNEL_MAP_DEFAULT);
//pa_channel_map_init_stereo(&channel_map); //pa_channel_map_init_stereo(&channel_map);
//pa_channel_map_parse(&channel_map, "front-left,front-right");
// not sure about what to do here
if(channels == 2)
{
pa_channel_map_parse(&channel_map, "front-left,front-right");
}
if(channels == 4)
{
pa_channel_map_parse(&channel_map, "front-left,front-right,rear-left,rear-right");
}
if(channels == 6)
{
pa_channel_map_parse(&channel_map, "front-left,front-right,rear-left,rear-right,front-center,lfe");
}
if(channels == 8)
{
pa_channel_map_parse(&channel_map, "front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right");
}
stream = pa_stream_new(context, streamname, &sample_specifications, &channel_map); stream = pa_stream_new(context, streamname, &sample_specifications, &channel_map);
pa_stream_set_state_callback(stream, stream_state_cb, mainloop); pa_stream_set_state_callback(stream, stream_state_cb, mainloop);
if (sounddevice->m.hapticeffect.effecttype == EFFECT_GEARSHIFT) if (sounddevice->m.hapticeffect.effecttype == EFFECT_GEARSHIFT)
{ {
pa_stream_set_write_callback(stream, gear_sound_stream, &sounddevice->sounddata); pa_stream_set_write_callback(stream, gear_sound_stream, &sounddevice->sounddata);
@ -128,17 +143,19 @@ int usb_generic_shaker_init(SoundDevice* sounddevice, pa_threaded_mainloop* main
buffer_attr.prebuf = (uint32_t) -1; buffer_attr.prebuf = (uint32_t) -1;
buffer_attr.minreq = (uint32_t) -1; buffer_attr.minreq = (uint32_t) -1;
pa_cvolume* cv; pa_cvolume cv;
pa_cvolume_mute(cv, channels); pa_cvolume_mute(&cv, channels);
pa_volume_t channel_volume = PA_CLAMP_VOLUME((pa_volume_t)((volume/100.d)*PA_VOLUME_NORM)); pa_volume_t channel_volume = PA_CLAMP_VOLUME((pa_volume_t)((volume/100.d)*PA_VOLUME_NORM));
pa_stream_flags_t stream_flags; pa_stream_flags_t stream_flags;
stream_flags = PA_STREAM_INTERPOLATE_TIMING | PA_STREAM_NOT_MONOTONIC | PA_STREAM_AUTO_TIMING_UPDATE | PA_STREAM_ADJUST_LATENCY | PA_STREAM_START_CORKED; stream_flags = PA_STREAM_INTERPOLATE_TIMING | PA_STREAM_NOT_MONOTONIC | PA_STREAM_AUTO_TIMING_UPDATE | PA_STREAM_ADJUST_LATENCY | PA_STREAM_START_CORKED;
cv->values[pan] = channel_volume;
assert(pa_stream_connect_playback(stream, devname, &buffer_attr, stream_flags, cv, NULL) == 0); // for now i'm only supporting playing on one specified channel which is the concept you should build your setups around
cv.values[pan] = channel_volume;
assert(pa_stream_connect_playback(stream, devname, &buffer_attr, stream_flags, &cv, NULL) == 0);
// Wait for the stream to be ready // Wait for the stream to be ready
for(;;) { for(;;) {
@ -148,7 +165,6 @@ int usb_generic_shaker_init(SoundDevice* sounddevice, pa_threaded_mainloop* main
pa_threaded_mainloop_wait(mainloop); pa_threaded_mainloop_wait(mainloop);
} }
//pa_threaded_mainloop_unlock(mainloop); //pa_threaded_mainloop_unlock(mainloop);
// Uncork the stream so it will start playing // Uncork the stream so it will start playing