UI: Add Xbox Live Communicator to UI #1873

faha223 · 2025-01-16T00:17:47Z

Added UI for attaching XBLC to expansion port
Refactored XBLC to use SDL2 Audio instead of QEMU Audio so that audio devices can be selected

Converted Audio to use SDL2 Audio instead of QEMU Audio so that users can choose which audio devices to use

faha223 · 2025-01-16T01:14:06Z

It still needs a bit more testing, and I need to recreate the quick-and-dirty XBLC image as a proper SVG

MasonT8198 · 2025-01-16T15:04:30Z

Looks good so far!

Just checking, does this support XBLC with an XMU attached (port 1/port 2) etc

faha223 · 2025-01-16T18:52:07Z

Looks good so far!

Just checking, does this support XBLC with an XMU attached (port 1/port 2) etc

Yes. Each controller has 2 Expansion slots. The XBLC can only go in Slot A but you can have an XBLC in Slot A and an XMU in Slot B, just like on a real controller

Recreated the xblc_mask.png from the SVG

…ched when switching input device while keeping the output device static. It seems to go away if you reinitialize both input and output voices whenever changing either device. Removed the code in xblc.c that was supposed to increase the volume when volume > SDL_MIX_MAXVOLUME. This code didn't work and has already been removed in the UI

…supposed to be included in the last commit

mborgerson

Thanks for the work. Some initial feedback

mborgerson · 2025-01-26T05:15:38Z

hw/xbox/xblc.c

+    USBXBLCState *s = (USBXBLCState *)userdata;
+
+    s->in.average_volume = s->in.volume * 
+        calc_average_amplitude((int16_t*)stream, len / 2) / 128;


If dividing by two to calculate number of samples from number of bytes, can you make it more explicit, e.g. (size_t num_samples = len / sizeof(int16_t);

I assume /128 is dividing through by SDL_MIX_MAXVOLUME?

mborgerson · 2025-01-26T05:17:51Z

hw/xbox/xblc.c

-        if (processed < max_len) return;
+static int calc_average_amplitude(const int16_t *samples, int len) {
+    int max = 0;
+    for(int i = 0; i < len / 2; i++) {


Why divide by 2 here? If samples is given as a int16_t, len should be the number of samples not bytes.

mborgerson · 2025-01-26T05:18:37Z

hw/xbox/xblc.c

-        processed = AUD_write(s->out.voice, (void *)data, max_len);
-        avail    -= processed;
-        if (processed < max_len) return;
+static int calc_average_amplitude(const int16_t *samples, int len) {


This function doesn't calculate the average?

mborgerson · 2025-01-26T05:19:22Z

hw/xbox/xblc.c

+    uint32_t max_len = MIN(len, fifo8_num_free(&s->in.fifo));
+    if (max_len > 0) {
+        if(s->in.volume < SDL_MIX_MAXVOLUME) {
+            uint8_t *buffer = g_malloc(max_len);


We should avoid memory allocation in this very frequently called function

I've changed this to use a function scope buffer of a fixed size, but would it be better to use a static global scope buffer?

mborgerson · 2025-01-26T06:03:10Z

hw/xbox/xblc.c

+    SDL_AudioSpec desired_spec;
+    desired_spec.channels = 1;
+    desired_spec.freq = s->sample_rate;
+    desired_spec.format = AUDIO_S16LSB;


~~What if the actual format differs from the desired format?~~ SDL apparently does conversion for you.

mborgerson · 2025-01-26T06:22:47Z

ui/xemu-input.c

@@ -489,10 +578,16 @@ void xemu_input_bind(int index, ControllerState *state, int save)
        // Unbind any XMUs


Comment out of date

mborgerson · 2025-01-26T06:23:40Z

ui/xemu-input.c

-                    PERIPHERAL_XMU)
-                    xemu_input_unbind_xmu(index, i);
+                // If a peripheral was bound, unbind the peripheral
+                switch (bound_controllers[index]->peripheral_types[i]) {


How about just testing with PERIPHERAL_NONE?

mborgerson · 2025-01-26T06:27:48Z

ui/xemu-input.c

+    return g_strdup_printf("%d|%d|%s|%s", (int)(200 * xblc->output_device_volume), (int)(200 * xblc->input_device_volume), output_device_label, input_device_label);
+}
+
+XblcState *xemu_input_deserialize_xblc_settings(const char *param)


This custom config parsing is tricky and I'd strongly like to avoid it. I think we can simplify it to an array of structures with genconfig and avoid parsing altogether. We can also enhance genconfig if need be

mborgerson · 2025-01-26T07:31:45Z

ui/xui/main-menu.cc

+    float original_volume = *ui_volume;
+    const char *label = (is_capture == 0) ? "Speaker" : "Microphone";
+    char description[32];
+    sprintf(description, "Volume: %.2f%%", 100 * original_volume);


Don't need so much precision

mborgerson · 2025-01-26T07:36:20Z

ui/xui/main-menu.cc

+        for(int device_index = -1; device_index < numOutputDevices; device_index++) {
+            const char *device_name = default_device_name;
+            if(device_index >= 0)
+                device_name = SDL_GetAudioDeviceName(device_index, is_capture);


Probably want to cache these device names and not query them on every frame

Changed naming of "average volume" to "peak volume" to more accurately describe what is being done/represented Removed the divide by 2 in calc_peak_volume so that the second half of the samples would also be factored when calculating the peak volume in the most recent sample data Changed references to 128 to use the SDL_MIX_MAXVOLUME preprocessor definition for clarity Changed the line that caches the peak volume in input_callback to use sizeof(int16_t) instead of 2 for clarity Changed input_callback to use a local buffer of size XBLC_FIFO_SIZE instead of allocating one at runtime Changed the get/set volume functions in xblc.h and xblc.c to use floating point values on the interval [0, 1] instead of integers on the range [0, SDL_MIX_MAXVOLUME] because they're used that way everywhere else anyway Changed the numOutputDevices variable in DrawAudioDeviceSelectComboBox function to num_devices to match the naming scheme and because this function doesn't only work with output devices. Changed xemu_input_bind to use an if statement instead of a switch. The switch was left behind from before I added the xemu_input_unbind_peripheral function when I was calling xemu_input_unbind_xmu and xemu_input_unbind_xblc directly

…'t have to query them every frame. The cache is invalidated whenever the number of devices changes. I put this outside ComboBox if statement so that if the available devices changes when the combo box isn't open the cache still gets updated.

…nfig settings specifically for XBLC

Added UI for attaching XBLC to expansion port

918634b

Converted Audio to use SDL2 Audio instead of QEMU Audio so that users can choose which audio devices to use

faha223 added 3 commits January 19, 2025 15:51

Recreated the xblc_mask image as an SVG

ca167e5

Recreated the xblc_mask.png from the SVG

Commented out the preprocessor definition of DEBUG_XBLC. That wasn't …

702e353

…supposed to be included in the last commit

faha223 marked this pull request as ready for review January 20, 2025 01:01

mborgerson reviewed Jan 26, 2025

View reviewed changes

faha223 added 6 commits January 26, 2025 12:43

Merge branch 'master' into xblc_gui

a64b6a4

This was supposed to be a part of the previous commit

14fd072

Removed the parameter serialization for XBLC. Replaced it with new co…

88545d7

…nfig settings specifically for XBLC

Merge branch 'master' into xblc_gui

df0d774

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

UI: Add Xbox Live Communicator to UI #1873

UI: Add Xbox Live Communicator to UI #1873

faha223 commented Jan 16, 2025

faha223 commented Jan 16, 2025

MasonT8198 commented Jan 16, 2025

faha223 commented Jan 16, 2025

mborgerson left a comment

mborgerson Jan 26, 2025

mborgerson Jan 26, 2025

mborgerson Jan 26, 2025

mborgerson Jan 26, 2025

faha223 Jan 26, 2025

mborgerson Jan 26, 2025

mborgerson Jan 26, 2025

mborgerson Jan 26, 2025

mborgerson Jan 26, 2025

mborgerson Jan 26, 2025

mborgerson Jan 26, 2025

		@@ -489,10 +578,16 @@ void xemu_input_bind(int index, ControllerState *state, int save)
		// Unbind any XMUs

UI: Add Xbox Live Communicator to UI #1873

Are you sure you want to change the base?

UI: Add Xbox Live Communicator to UI #1873

Conversation

faha223 commented Jan 16, 2025

faha223 commented Jan 16, 2025

MasonT8198 commented Jan 16, 2025

faha223 commented Jan 16, 2025

mborgerson left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment