Enlightenment CVS committal Author : kwo Project : e16 Module : e
Dir : e16/e/src Modified Files: edebug.h sound.c sound_load.c util.h Log Message: Various sound/module/visibility fixes. =================================================================== RCS file: /cvs/e/e16/e/src/edebug.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- edebug.h 28 Jan 2008 21:20:09 -0000 1.7 +++ edebug.h 8 Mar 2008 19:23:54 -0000 1.8 @@ -23,6 +23,8 @@ #ifndef _EDEBUG_H_ #define _EDEBUG_H_ +#include "util.h" + #define ENABLE_DEBUG_EVENTS 1 #if ENABLE_DEBUG_EVENTS @@ -61,7 +63,7 @@ void EDebugInit(const char *s); void EDebugSet(unsigned int type, int value); -int EDebug(unsigned int type); +__EXPORT__ int EDebug(unsigned int type); #else =================================================================== RCS file: /cvs/e/e16/e/src/sound.c,v retrieving revision 1.61 retrieving revision 1.62 diff -u -3 -r1.61 -r1.62 --- sound.c 1 Mar 2008 15:22:32 -0000 1.61 +++ sound.c 8 Mar 2008 19:23:54 -0000 1.62 @@ -49,10 +49,10 @@ #if USE_MODULES static const SoundOps *ops = NULL; #else -#if defined(HAVE_SOUND_ESD) +#if HAVE_SOUND_ESD extern const SoundOps SoundOps_esd; static const SoundOps *ops = &SoundOps_esd; -#elif defined(HAVE_SOUND_PA) +#elif HAVE_SOUND_PA extern const SoundOps SoundOps_pa; static const SoundOps *ops = &SoundOps_pa; #endif @@ -190,18 +190,22 @@ err = -1; #if USE_MODULES if (!ops) +#if HAVE_SOUND_ESD ops = ModLoadSym("sound", "SoundOps", "esd"); +#elif HAVE_SOUND_PA + ops = ModLoadSym("sound", "SoundOps", "pa"); +#endif #endif if (ops && ops->Init) err = ops->Init(); if (err) { + Conf_sound.enable = 0; AlertX(_("Error initialising sound"), _("OK"), NULL, NULL, _("Audio was enabled for Enlightenment but there was an error\n" "communicating with the audio server (Esound). Audio will\n" "now be disabled.\n")); - Conf_sound.enable = 0; } } =================================================================== RCS file: /cvs/e/e16/e/src/sound_load.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- sound_load.c 23 Feb 2008 12:17:18 -0000 1.2 +++ sound_load.c 8 Mar 2008 19:23:54 -0000 1.3 @@ -48,11 +48,9 @@ #else afSetVirtualByteOrder(in_file, AF_DEFAULT_TRACK, AF_BYTEORDER_LITTLEENDIAN); #endif -#if !USE_MODULES if (EDebug(EDBUG_TYPE_SOUND)) Eprintf("SoundSampleGetData chan=%d width=%d rate=%d\n", ssd->channels, ssd->bit_per_sample, ssd->rate); -#endif bytes_per_frame = (ssd->bit_per_sample * ssd->channels) / 8; ssd->size = frame_count * bytes_per_frame; =================================================================== RCS file: /cvs/e/e16/e/src/util.h,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- util.h 23 Feb 2008 12:09:38 -0000 1.15 +++ util.h 8 Mar 2008 19:23:54 -0000 1.16 @@ -89,7 +89,7 @@ void Esetenv(const char *name, const char *value); /* misc.c */ -void __PRINTF__ Eprintf(const char *fmt, ...); +__EXPORT__ void __PRINTF__ Eprintf(const char *fmt, ...); #ifdef HAVE_SNPRINTF #define Evsnprintf vsnprintf ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs