enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

remove old enum, rename to new enum values 

SVN revision: 55915
This commit is contained in:
Mike Blumenkrantz 2011-01-06 01:31:52 +00:00
parent 7b67b48c1a
commit 97a5b973f0
1 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/bin/e_fm/e_fm_main.c
View File

@ -71,15 +71,7 @@ void *alloca (size_t);
* if using eeze, functions will point to _e_fm_main_eeze_X * if using eeze, functions will point to _e_fm_main_eeze_X
*/ */
typedef enum static Efm_Mode mode = EFM_MODE_USING_RASTER_MOUNT;
{
USING_RASTER_MOUNT,
USING_HAL_MOUNT,
USING_UDISKS_MOUNT,
USING_EEZE_MOUNT
} efm_mode;
static efm_mode mode = USING_RASTER_MOUNT;
/* FIXME: things to add to the slave enlightenment_fm process and ipc to e: /* FIXME: things to add to the slave enlightenment_fm process and ipc to e:
* *
@ -178,21 +170,21 @@ main(int argc, char **argv)
void void
_e_fm_main_hal_catch(Eina_Bool usable) _e_fm_main_hal_catch(Eina_Bool usable)
{ {
if (usable) mode = USING_HAL_MOUNT; if (usable) mode = EFM_MODE_USING_HAL_MOUNT;
} }
#endif #endif
#ifdef HAVE_UDISKS_MOUNT #ifdef HAVE_UDISKS_MOUNT
void void
_e_fm_main_udisks_catch(Eina_Bool usable) _e_fm_main_udisks_catch(Eina_Bool usable)
{ {
if (usable) mode = USING_UDISKS_MOUNT; if (usable) mode = EFM_MODE_USING_UDISKS_MOUNT;
} }
#endif #endif
#ifdef HAVE_EEZE_MOUNT #ifdef HAVE_EEZE_MOUNT
void void
_e_fm_main_eeze_catch(Eina_Bool usable) _e_fm_main_eeze_catch(Eina_Bool usable)
{ {
if (usable) mode = USING_EEZE_MOUNT; if (usable) mode = EFM_MODE_USING_EEZE_MOUNT;
} }
#endif #endif
@ -216,17 +208,17 @@ e_volume_mount(E_Volume *v)
switch (mode) switch (mode)
{ {
#ifdef HAVE_HAL_MOUNT #ifdef HAVE_HAL_MOUNT
case USING_HAL_MOUNT: case EFM_MODE_USING_HAL_MOUNT:
_e_fm_main_hal_volume_mount(v); _e_fm_main_hal_volume_mount(v);
break; break;
#endif #endif
#ifdef HAVE_UDISKS_MOUNT #ifdef HAVE_UDISKS_MOUNT
case USING_UDISKS_MOUNT: case EFM_MODE_USING_UDISKS_MOUNT:
_e_fm_main_udisks_volume_mount(v); _e_fm_main_udisks_volume_mount(v);
break; break;
#endif #endif
#ifdef HAVE_EEZE_MOUNT #ifdef HAVE_EEZE_MOUNT
case USING_EEZE_MOUNT: case EFM_MODE_USING_EEZE_MOUNT:
_e_fm_main_eeze_volume_mount(v); _e_fm_main_eeze_volume_mount(v);
break; break;
#endif #endif
@ -242,17 +234,17 @@ e_volume_unmount(E_Volume *v)
switch (mode) switch (mode)
{ {
#ifdef HAVE_HAL_MOUNT #ifdef HAVE_HAL_MOUNT
case USING_HAL_MOUNT: case EFM_MODE_USING_HAL_MOUNT:
_e_fm_main_hal_volume_unmount(v); _e_fm_main_hal_volume_unmount(v);
break; break;
#endif #endif
#ifdef HAVE_UDISKS_MOUNT #ifdef HAVE_UDISKS_MOUNT
case USING_UDISKS_MOUNT: case EFM_MODE_USING_UDISKS_MOUNT:
_e_fm_main_udisks_volume_unmount(v); _e_fm_main_udisks_volume_unmount(v);
break; break;
#endif #endif
#ifdef HAVE_EEZE_MOUNT #ifdef HAVE_EEZE_MOUNT
case USING_EEZE_MOUNT: case EFM_MODE_USING_EEZE_MOUNT:
_e_fm_main_eeze_volume_unmount(v); _e_fm_main_eeze_volume_unmount(v);
break; break;
#endif #endif
@ -267,17 +259,17 @@ e_volume_eject(E_Volume *v)
switch (mode) switch (mode)
{ {
#ifdef HAVE_HAL_MOUNT #ifdef HAVE_HAL_MOUNT
case USING_HAL_MOUNT: case EFM_MODE_USING_HAL_MOUNT:
_e_fm_main_hal_volume_eject(v); _e_fm_main_hal_volume_eject(v);
break; break;
#endif #endif
#ifdef HAVE_UDISKS_MOUNT #ifdef HAVE_UDISKS_MOUNT
case USING_UDISKS_MOUNT: case EFM_MODE_USING_UDISKS_MOUNT:
_e_fm_main_udisks_volume_eject(v); _e_fm_main_udisks_volume_eject(v);
break; break;
#endif #endif
#ifdef HAVE_EEZE_MOUNT #ifdef HAVE_EEZE_MOUNT
case USING_EEZE_MOUNT: case EFM_MODE_USING_EEZE_MOUNT:
_e_fm_main_eeze_volume_eject(v); _e_fm_main_eeze_volume_eject(v);
break; break;
#endif #endif
@ -292,15 +284,15 @@ e_volume_find(const char *udi)
switch (mode) switch (mode)
{ {
#ifdef HAVE_HAL_MOUNT #ifdef HAVE_HAL_MOUNT
case USING_HAL_MOUNT: case EFM_MODE_USING_HAL_MOUNT:
return _e_fm_main_hal_volume_find(udi); return _e_fm_main_hal_volume_find(udi);
#endif #endif
#ifdef HAVE_UDISKS_MOUNT #ifdef HAVE_UDISKS_MOUNT
case USING_UDISKS_MOUNT: case EFM_MODE_USING_UDISKS_MOUNT:
return _e_fm_main_udisks_volume_find(udi); return _e_fm_main_udisks_volume_find(udi);
#endif #endif
#ifdef HAVE_EEZE_MOUNT #ifdef HAVE_EEZE_MOUNT
case USING_EEZE_MOUNT: case EFM_MODE_USING_EEZE_MOUNT:
return _e_fm_main_eeze_volume_find(udi); return _e_fm_main_eeze_volume_find(udi);
#endif #endif
default: default:
@ -315,17 +307,17 @@ e_storage_del(const char *udi)
switch (mode) switch (mode)
{ {
#ifdef HAVE_HAL_MOUNT #ifdef HAVE_HAL_MOUNT
case USING_HAL_MOUNT: case EFM_MODE_USING_HAL_MOUNT:
_e_fm_main_hal_storage_del(udi); _e_fm_main_hal_storage_del(udi);
break; break;
#endif #endif
#ifdef HAVE_UDISKS_MOUNT #ifdef HAVE_UDISKS_MOUNT
case USING_UDISKS_MOUNT: case EFM_MODE_USING_UDISKS_MOUNT:
_e_fm_main_udisks_storage_del(udi); _e_fm_main_udisks_storage_del(udi);
break; break;
#endif #endif
#ifdef HAVE_EEZE_MOUNT #ifdef HAVE_EEZE_MOUNT
case USING_EEZE_MOUNT: case EFM_MODE_USING_EEZE_MOUNT:
_e_fm_main_eeze_storage_del(udi); _e_fm_main_eeze_storage_del(udi);
break; break;
#endif #endif
@ -340,15 +332,15 @@ e_storage_find(const char *udi)
switch (mode) switch (mode)
{ {
#ifdef HAVE_HAL_MOUNT #ifdef HAVE_HAL_MOUNT
case USING_HAL_MOUNT: case EFM_MODE_USING_HAL_MOUNT:
return _e_fm_main_hal_storage_find(udi); return _e_fm_main_hal_storage_find(udi);
#endif #endif
#ifdef HAVE_UDISKS_MOUNT #ifdef HAVE_UDISKS_MOUNT
case USING_UDISKS_MOUNT: case EFM_MODE_USING_UDISKS_MOUNT:
return _e_fm_main_udisks_storage_find(udi); return _e_fm_main_udisks_storage_find(udi);
#endif #endif
#ifdef HAVE_EEZE_MOUNT #ifdef HAVE_EEZE_MOUNT
case USING_EEZE_MOUNT: case EFM_MODE_USING_EEZE_MOUNT:
return _e_fm_main_eeze_storage_find(udi); return _e_fm_main_eeze_storage_find(udi);
#endif #endif
default: default: