remove mixer wizard check
alsa is no longer the only output method, so this was a bogus check anyway CID 1039872
This commit is contained in:
parent
09aefdeb89
commit
6beb98c4e1
|
@ -36,7 +36,6 @@ wizardpkg_LTLIBRARIES = src/modules/wizard/module.la \
|
||||||
src/modules/wizard/page_110.la \
|
src/modules/wizard/page_110.la \
|
||||||
src/modules/wizard/page_120.la \
|
src/modules/wizard/page_120.la \
|
||||||
src/modules/wizard/page_130.la \
|
src/modules/wizard/page_130.la \
|
||||||
src/modules/wizard/page_140.la \
|
|
||||||
src/modules/wizard/page_150.la \
|
src/modules/wizard/page_150.la \
|
||||||
src/modules/wizard/page_160.la \
|
src/modules/wizard/page_160.la \
|
||||||
src/modules/wizard/page_170.la \
|
src/modules/wizard/page_170.la \
|
||||||
|
@ -128,11 +127,6 @@ src_modules_wizard_page_130_la_CPPFLAGS = $(MOD_CPPFLAGS)
|
||||||
src_modules_wizard_page_130_la_LDFLAGS = $(MOD_LDFLAGS)
|
src_modules_wizard_page_130_la_LDFLAGS = $(MOD_LDFLAGS)
|
||||||
src_modules_wizard_page_130_la_SOURCES = src/modules/wizard/page_130.c
|
src_modules_wizard_page_130_la_SOURCES = src/modules/wizard/page_130.c
|
||||||
|
|
||||||
src_modules_wizard_page_140_la_LIBADD = $(MOD_LIBS)
|
|
||||||
src_modules_wizard_page_140_la_CPPFLAGS = $(MOD_CPPFLAGS)
|
|
||||||
src_modules_wizard_page_140_la_LDFLAGS = $(MOD_LDFLAGS)
|
|
||||||
src_modules_wizard_page_140_la_SOURCES = src/modules/wizard/page_140.c
|
|
||||||
|
|
||||||
src_modules_wizard_page_150_la_LIBADD = $(MOD_LIBS)
|
src_modules_wizard_page_150_la_LIBADD = $(MOD_LIBS)
|
||||||
src_modules_wizard_page_150_la_CPPFLAGS = $(MOD_CPPFLAGS) -DNEED_X=1
|
src_modules_wizard_page_150_la_CPPFLAGS = $(MOD_CPPFLAGS) -DNEED_X=1
|
||||||
src_modules_wizard_page_150_la_LDFLAGS = $(MOD_LDFLAGS)
|
src_modules_wizard_page_150_la_LDFLAGS = $(MOD_LDFLAGS)
|
||||||
|
|
|
@ -1,56 +0,0 @@
|
||||||
/* Setup if we need mixer? */
|
|
||||||
#include "e_wizard.h"
|
|
||||||
/*
|
|
||||||
EAPI int
|
|
||||||
wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__)
|
|
||||||
{
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
EAPI int
|
|
||||||
wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__)
|
|
||||||
{
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
EAPI int
|
|
||||||
wizard_page_show(E_Wizard_Page *pg __UNUSED__)
|
|
||||||
{
|
|
||||||
int hav_mixer = 0;
|
|
||||||
#ifdef HAVE_ALSA
|
|
||||||
hav_mixer = 1;
|
|
||||||
#endif
|
|
||||||
if (!hav_mixer)
|
|
||||||
{
|
|
||||||
E_Config_Module *em;
|
|
||||||
Eina_List *l;
|
|
||||||
|
|
||||||
EINA_LIST_FOREACH(e_config->modules, l, em)
|
|
||||||
{
|
|
||||||
if (!em->name) continue;
|
|
||||||
if (!strcmp(em->name, "mixer"))
|
|
||||||
{
|
|
||||||
e_config->modules = eina_list_remove_list
|
|
||||||
(e_config->modules, l);
|
|
||||||
if (em->name) eina_stringshare_del(em->name);
|
|
||||||
free(em);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
e_config_save_queue();
|
|
||||||
}
|
|
||||||
return 0; /* 1 == show ui, and wait for user, 0 == just continue */
|
|
||||||
}
|
|
||||||
/*
|
|
||||||
EAPI int
|
|
||||||
wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
|
|
||||||
{
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
EAPI int
|
|
||||||
wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
|
|
||||||
{
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
*/
|
|
Loading…
Reference in New Issue