robert/alsa-scarlett-gui
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move card_destroy_callback() before alsa_card_callback()

Browse Source
This commit is contained in:
Geoffrey D. Bennett
2025-01-04 03:29:41 +10:30
parent 01c947f434
commit c7357c0539
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/alsa.c
View File

@@ -766,6 +766,27 @@ static void alsa_elem_change(struct alsa_elem *elem) {
} }
} }
static void card_destroy_callback(void *data) {
struct alsa_card *card = data;
// close the windows associated with this card
destroy_card_window(card);
// TODO: there is more to free
free(card->device);
free(card->serial);
free(card->name);
free(card);
// go through the alsa_cards array and clear the entry for this card
for (int i = 0; i < alsa_cards->len; i++) {
struct alsa_card **card_ptr =
&g_array_index(alsa_cards, struct alsa_card *, i);
if (*card_ptr == card)
*card_ptr = NULL;
}
}
static gboolean alsa_card_callback( static gboolean alsa_card_callback(
GIOChannel *source, GIOChannel *source,
GIOCondition condition, GIOCondition condition,
@@ -853,27 +874,6 @@ struct alsa_card *card_create(int card_num) {
return card; return card;
} }
static void card_destroy_callback(void *data) {
struct alsa_card *card = data;
// close the windows associated with this card
destroy_card_window(card);
// TODO: there is more to free
free(card->device);
free(card->serial);
free(card->name);
free(card);
// go through the alsa_cards array and clear the entry for this card
for (int i = 0; i < alsa_cards->len; i++) {
struct alsa_card **card_ptr =
&g_array_index(alsa_cards, struct alsa_card *, i);
if (*card_ptr == card)
*card_ptr = NULL;
}
}
static void alsa_add_card_callback(struct alsa_card *card) { static void alsa_add_card_callback(struct alsa_card *card) {
card->io_channel = g_io_channel_unix_new(card->pfd.fd); card->io_channel = g_io_channel_unix_new(card->pfd.fd);
card->event_source_id = g_io_add_watch_full( card->event_source_id = g_io_add_watch_full(