comparison gui/mplayer/gtk/opts.c @ 32741:872b714d47bd

Cast properly (to avoid compiler warnings).
author ib
date Sat, 29 Jan 2011 16:39:52 +0000
parents fbe5c829c69b
children 6e22bcc85ac5
comparison
equal deleted inserted replaced
32740:01e248c1b369 32741:872b714d47bd
1555 static void audioButton(GtkButton *button, gpointer user_data) { 1555 static void audioButton(GtkButton *button, gpointer user_data) {
1556 switch( (int)user_data ) { 1556 switch( (int)user_data ) {
1557 case 1: 1557 case 1:
1558 #ifdef CONFIG_OSS_AUDIO 1558 #ifdef CONFIG_OSS_AUDIO
1559 if (strncmp(ao_driver[0], "oss", 3) == 0) { 1559 if (strncmp(ao_driver[0], "oss", 3) == 0) {
1560 gfree(&gtkAOOSSDevice); 1560 gfree((void **) &gtkAOOSSDevice);
1561 gtkAOOSSDevice = gstrdup(getGtkEntryText(CEAudioDevice)); 1561 gtkAOOSSDevice = gstrdup(getGtkEntryText(CEAudioDevice));
1562 gfree(&gtkAOOSSMixer); 1562 gfree((void **) &gtkAOOSSMixer);
1563 gtkAOOSSMixer = gstrdup(getGtkEntryText(CEAudioMixer)); 1563 gtkAOOSSMixer = gstrdup(getGtkEntryText(CEAudioMixer));
1564 gfree(&gtkAOOSSMixerChannel); 1564 gfree((void **) &gtkAOOSSMixerChannel);
1565 gtkAOOSSMixerChannel = gstrdup(getGtkEntryText(CEAudioMixerChannel)); 1565 gtkAOOSSMixerChannel = gstrdup(getGtkEntryText(CEAudioMixerChannel));
1566 } 1566 }
1567 #endif 1567 #endif
1568 #ifdef CONFIG_ALSA 1568 #ifdef CONFIG_ALSA
1569 if (strncmp(ao_driver[0], "alsa", 4) == 0) { 1569 if (strncmp(ao_driver[0], "alsa", 4) == 0) {
1570 gfree(&gtkAOALSADevice); 1570 gfree((void **) &gtkAOALSADevice);
1571 gtkAOALSADevice = gstrdup(getGtkEntryText(CEAudioDevice)); 1571 gtkAOALSADevice = gstrdup(getGtkEntryText(CEAudioDevice));
1572 gfree(&gtkAOALSAMixer); 1572 gfree((void **) &gtkAOALSAMixer);
1573 gtkAOALSAMixer = gstrdup(getGtkEntryText(CEAudioMixer)); 1573 gtkAOALSAMixer = gstrdup(getGtkEntryText(CEAudioMixer));
1574 gfree(&gtkAOALSAMixerChannel); 1574 gfree((void **) &gtkAOALSAMixerChannel);
1575 gtkAOALSAMixerChannel = gstrdup(getGtkEntryText(CEAudioMixerChannel)); 1575 gtkAOALSAMixerChannel = gstrdup(getGtkEntryText(CEAudioMixerChannel));
1576 } 1576 }
1577 #endif 1577 #endif
1578 #ifdef CONFIG_SDL 1578 #ifdef CONFIG_SDL
1579 if (strncmp(ao_driver[0], "sdl", 3) == 0) { 1579 if (strncmp(ao_driver[0], "sdl", 3) == 0) {
1580 gfree(&gtkAOSDLDriver); 1580 gfree((void **) &gtkAOSDLDriver);
1581 gtkAOSDLDriver = gstrdup(getGtkEntryText(CEAudioDevice)); 1581 gtkAOSDLDriver = gstrdup(getGtkEntryText(CEAudioDevice));
1582 } 1582 }
1583 #endif 1583 #endif
1584 #ifdef CONFIG_ESD 1584 #ifdef CONFIG_ESD
1585 if (strncmp(ao_driver[0], "esd", 3) == 0) { 1585 if (strncmp(ao_driver[0], "esd", 3) == 0) {
1586 gfree(&gtkAOESDDevice); 1586 gfree((void **) &gtkAOESDDevice);
1587 gtkAOESDDevice = gstrdup(getGtkEntryText(CEAudioDevice)); 1587 gtkAOESDDevice = gstrdup(getGtkEntryText(CEAudioDevice));
1588 } 1588 }
1589 #endif 1589 #endif
1590 case 0: 1590 case 0:
1591 HideAudioConfig(); 1591 HideAudioConfig();