e16
/
e16
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Deactivate more code when disabling sound. 

SVN revision: 31479
This commit is contained in:
Kim Woelders 2007-08-23 18:48:21 +00:00
parent 484e708f85
commit 8c34f94d61
9 changed files with 272 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.in
View File

@ -109,6 +109,9 @@ if test "x$enable_sound" = "xyes"; then
AC_MSG_WARN([Sound support was requested but not found.])
])
fi
if test "x$enable_sound" = "xyes"; then
AC_DEFINE(HAVE_SOUND, 1, [Sound support])
fi
CPPFLAGS="$X_CFLAGS $CPPFLAGS"
LDFLAGS="$X_LIBS $LDFLAGS -L$prefix/lib"

4
src/E.h
View File

@ -32,6 +32,7 @@
#include "alert.h"
#include "edebug.h"
#include "lang.h"
#include "sound.h"
#include "util.h"
#define USE_EXT_INIT_WIN 1
@ -646,9 +647,6 @@ void SetupX(const char *dstr);
/* slideouts.c */
int SlideoutsConfigLoad(FILE * fs);
/* sound.c */
void SoundPlay(const char *name);
/* startup.c */
void StartupWindowsCreate(void);
void StartupWindowsOpen(void);

3
src/Makefile.am
View File

@ -89,7 +89,8 @@ e16_SOURCES = \
size.c \
slideout.c \
snaps.c snaps.h \
sound.c \
sound.c sound.h \
sound_esd.c \
stacking.c \
startup.c \
systray.c \

4
src/alert.c
View File

@ -30,11 +30,9 @@
#include "alert.h"
#include "lang.h"
#include "session.h"
#include "sound.h"
#include "util.h"
/* Should be elsewhere */
void SoundPlay(const char *name);
#define ExTextExtents XmbTextExtents
#define ExDrawString XmbDrawString

5
src/mod-misc.c
View File

@ -56,7 +56,10 @@ extern const EModule ModMenus;
extern const EModule ModMisc;
extern const EModule ModPagers;
extern const EModule ModSlideouts;
#if HAVE_SOUND
extern const EModule ModSound;
#endif
extern const EModule ModTextclass;
extern const EModule ModTheme;
extern const EModule ModTooltips;
@ -91,7 +94,9 @@ const EModule *p_modules[] = {
&ModMisc,
&ModPagers,
&ModSlideouts,
#if HAVE_SOUND
&ModSound,
#endif
&ModTextclass,
&ModTheme,
&ModTooltips,

2
src/settings.c
View File

@ -647,7 +647,9 @@ static const DialogDef *dialogs[] = {
&DlgMenus,
&DlgAutoraise,
&DlgTooltips,
#if HAVE_SOUND
&DlgSound,
#endif
&DlgGroupDefaults,
&DlgRemember,
&DlgFx,

219
src/sound.c
View File

@ -22,40 +22,18 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include "E.h"
#if HAVE_SOUND
#include "dialog.h"
#include "e16-ecore_list.h"
#include "emodule.h"
#include "settings.h"
#ifdef HAVE_LIBESD
#include <esd.h>
#include <audiofile.h>
#ifdef WORDS_BIGENDIAN
#define SWAP_SHORT( x ) x = ( ( x & 0x00ff ) << 8 ) | ( ( x >> 8 ) & 0x00ff )
#define SWAP_LONG( x ) x = ( ( ( x & 0x000000ff ) << 24 ) |\
( ( x & 0x0000ff00 ) << 8 ) |\
( ( x & 0x00ff0000 ) >> 8 ) |\
( ( x & 0xff000000 ) >> 24 ) )
#endif
#endif
typedef struct
{
char *file;
int rate;
int format;
int samples;
unsigned char *data;
int id;
} Sample;
#include "sound.h"
typedef struct
{
char *name;
char *file;
Sample *sample;
unsigned int ref_count;
} SoundClass;
static struct
@ -64,132 +42,10 @@ static struct
char *theme;
} Conf_sound;
static int sound_fd = -1;
static Ecore_List *sound_list = NULL;
#ifdef HAVE_LIBESD
static Sample *
LoadWav(const char *file)
{
AFfilehandle in_file;
char *find = NULL;
Sample *s;
int in_format, in_width, in_channels, frame_count;
int bytes_per_frame, frames_read;
double in_rate;
find = FindFile(file, Mode.theme.path, 0);
if (!find)
{
DialogOK(_("Error finding sound file"),
_("Warning! Enlightenment was unable to load the\n"
"following sound file:\n%s\n"
"Enlightenment will continue to operate, but you\n"
"may wish to check your configuration settings.\n"), file);
return NULL;
}
in_file = afOpenFile(find, "r", NULL);
if (!in_file)
{
Efree(find);
return NULL;
}
s = EMALLOC(Sample, 1);
if (!s)
{
Efree(find);
afCloseFile(in_file);
return NULL;
}
frame_count = afGetFrameCount(in_file, AF_DEFAULT_TRACK);
in_channels = afGetChannels(in_file, AF_DEFAULT_TRACK);
in_rate = afGetRate(in_file, AF_DEFAULT_TRACK);
afGetSampleFormat(in_file, AF_DEFAULT_TRACK, &in_format, &in_width);
#ifdef WORDS_BIGENDIAN
afSetVirtualByteOrder(in_file, AF_DEFAULT_TRACK, AF_BYTEORDER_BIGENDIAN);
#else
afSetVirtualByteOrder(in_file, AF_DEFAULT_TRACK, AF_BYTEORDER_LITTLEENDIAN);
#endif
s->file = Estrdup(find);
s->rate = 44100;
s->format = ESD_STREAM | ESD_PLAY;
s->samples = 0;
s->data = NULL;
s->id = 0;
if (in_width == 8)
s->format |= ESD_BITS8;
else if (in_width == 16)
s->format |= ESD_BITS16;
bytes_per_frame = (in_width * in_channels) / 8;
if (in_channels == 1)
s->format |= ESD_MONO;
else if (in_channels == 2)
s->format |= ESD_STEREO;
s->rate = (int)in_rate;
s->samples = frame_count * bytes_per_frame;
s->data = EMALLOC(unsigned char, frame_count * bytes_per_frame);
frames_read = afReadFrames(in_file, AF_DEFAULT_TRACK, s->data, frame_count);
afCloseFile(in_file);
Efree(find);
return s;
}
static void
SamplePlay(Sample * s)
{
int size, confirm = 0;
if ((sound_fd < 0) || (!Conf_sound.enable) || (!s))
return;
if (!s->id && s->data)
{
size = s->samples;
s->id = esd_sample_getid(sound_fd, s->file);
if (s->id < 0)
{
s->id =
esd_sample_cache(sound_fd, s->format, s->rate, size, s->file);
write(sound_fd, s->data, size);
confirm = esd_confirm_sample_cache(sound_fd);
if (confirm != s->id)
s->id = 0;
}
Efree(s->data);
s->data = NULL;
}
if (s->id > 0)
esd_sample_play(sound_fd, s->id);
}
#endif /* HAVE_LIBESD */
static void
SampleDestroy(Sample * s)
{
#ifdef HAVE_LIBESD
if ((s->id) && (sound_fd >= 0))
{
/* Why the hell is this symbol not in esd? */
/* it's in esd.h - evil evil evil */
/* esd_sample_kill(sound_fd,s->id); */
esd_sample_free(sound_fd, s->id);
}
#endif
if (s->data)
Efree(s->data);
if (s->file)
Efree(s->file);
if (s)
Efree(s);
}
extern const SoundOps SoundOps_esd;
static const SoundOps *ops = &SoundOps_esd;
static void
_SclassSampleDestroy(void *data, void *user_data __UNUSED__)
@ -199,7 +55,8 @@ _SclassSampleDestroy(void *data, void *user_data __UNUSED__)
if (!sclass || !sclass->sample)
return;
SampleDestroy(sclass->sample);
if (ops && ops->SampleDestroy)
ops->SampleDestroy(sclass->sample);
sclass->sample = NULL;
}
@ -228,13 +85,13 @@ SclassDestroy(SoundClass * sclass)
{
if (!sclass)
return;
ecore_list_node_remove(sound_list, sclass);
_SclassSampleDestroy(sclass, NULL);
if (sclass->name)
Efree(sclass->name);
if (sclass->file)
Efree(sclass->file);
if (sclass->sample)
SampleDestroy(sclass->sample);
Efree(sclass);
}
@ -243,14 +100,32 @@ SclassApply(SoundClass * sclass)
{
if (!sclass || !Conf_sound.enable)
return;
#ifdef HAVE_LIBESD
if (!sclass->sample)
sclass->sample = LoadWav(sclass->file);
if (sclass->sample)
SamplePlay(sclass->sample);
if (!sclass->sample && ops && ops->SampleLoad)
{
char *file;
file = FindFile(sclass->file, Mode.theme.path, 0);
if (file)
{
sclass->sample = ops->SampleLoad(file);
Efree(file);
}
else
{
DialogOK(_("Error finding sound file"),
_("Warning! Enlightenment was unable to load the\n"
"following sound file:\n%s\n"
"Enlightenment will continue to operate, but you\n"
"may wish to check your configuration settings.\n"),
file);
}
}
if (sclass->sample && ops && ops->SamplePlay)
ops->SamplePlay(sclass->sample);
else
SclassDestroy(sclass);
#endif
}
static int
@ -294,21 +169,16 @@ SoundFree(const char *name)
static void
SoundInit(void)
{
#ifdef HAVE_LIBESD
int fd;
#endif
int err;
#ifdef HAVE_LIBESD
if (!Conf_sound.enable)
return;
if (sound_fd != -1)
return;
err = -1;
if (ops && ops->Init)
err = ops->Init();
fd = esd_open_sound(NULL);
if (fd >= 0)
sound_fd = fd;
else
if (err)
{
AlertX(_("Error initialising sound"), _("OK"), NULL, NULL,
_("Audio was enabled for Enlightenment but there was an error\n"
@ -316,21 +186,17 @@ SoundInit(void)
"now be disabled.\n"));
Conf_sound.enable = 0;
}
#else
Conf_sound.enable = 0;
#endif
}
static void
SoundExit(void)
{
if (sound_fd < 0)
return;
ecore_list_for_each(sound_list, _SclassSampleDestroy, NULL);
close(sound_fd);
sound_fd = -1;
if (ops && ops->Exit)
ops->Exit();
Conf_sound.enable = 0;
}
/*
@ -490,7 +356,6 @@ SoundIpc(const char *params)
}
else if (!strncmp(cmd, "off", 2))
{
Conf_sound.enable = 0;
SoundExit();
}
else if (!strncmp(cmd, "on", 2))
@ -534,3 +399,5 @@ const EModule ModSound = {
{N_IPC_FUNCS, SoundIpcArray},
{N_CFG_ITEMS, SoundCfgItems}
};
#endif /* HAVE_SOUND */

46
src/sound.h Normal file
View File

@ -0,0 +1,46 @@
/*
* Copyright (C) 2004-2007 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#ifndef _SOUND_H_
#define _SOUND_H_
#include "config.h"
typedef struct _sample Sample;
typedef struct
{
int (*Init) (void);
void (*Exit) (void);
Sample *(*SampleLoad) (const char *file);
void (*SampleDestroy) (Sample * s);
void (*SamplePlay) (Sample * s);
} SoundOps;
/* sound.c */
#if HAVE_SOUND
void SoundPlay(const char *name);
#else
#define SoundPlay(name) do{}while(0)
#endif
#endif /* _SOUND_H_ */

169
src/sound_esd.c Normal file
View File

@ -0,0 +1,169 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
* Copyright (C) 2004-2007 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include "E.h"
#if defined(HAVE_SOUND) && defined(HAVE_LIBESD)
#include "sound.h"
#include <esd.h>
#include <audiofile.h>
struct _sample
{
char *file; /* We should not need this */
int rate;
int format;
int samples;
unsigned char *data;
int id;
};
static int sound_fd = -1;
static Sample *
_esd_Load(const char *file)
{
AFfilehandle in_file;
Sample *s;
int in_format, in_width, in_channels, frame_count;
int bytes_per_frame, frames_read;
double in_rate;
in_file = afOpenFile(file, "r", NULL);
if (!in_file)
return NULL;
s = EMALLOC(Sample, 1);
if (!s)
{
afCloseFile(in_file);
return NULL;
}
frame_count = afGetFrameCount(in_file, AF_DEFAULT_TRACK);
in_channels = afGetChannels(in_file, AF_DEFAULT_TRACK);
in_rate = afGetRate(in_file, AF_DEFAULT_TRACK);
afGetSampleFormat(in_file, AF_DEFAULT_TRACK, &in_format, &in_width);
#ifdef WORDS_BIGENDIAN
afSetVirtualByteOrder(in_file, AF_DEFAULT_TRACK, AF_BYTEORDER_BIGENDIAN);
#else
afSetVirtualByteOrder(in_file, AF_DEFAULT_TRACK, AF_BYTEORDER_LITTLEENDIAN);
#endif
s->file = Estrdup(file);
s->rate = 44100;
s->format = ESD_STREAM | ESD_PLAY;
s->samples = 0;
s->data = NULL;
s->id = 0;
if (in_width == 8)
s->format |= ESD_BITS8;
else if (in_width == 16)
s->format |= ESD_BITS16;
bytes_per_frame = (in_width * in_channels) / 8;
if (in_channels == 1)
s->format |= ESD_MONO;
else if (in_channels == 2)
s->format |= ESD_STEREO;
s->rate = (int)in_rate;
s->samples = frame_count * bytes_per_frame;
s->data = EMALLOC(unsigned char, frame_count * bytes_per_frame);
frames_read = afReadFrames(in_file, AF_DEFAULT_TRACK, s->data, frame_count);
afCloseFile(in_file);
return s;
}
static void
_esd_Destroy(Sample * s)
{
if (s->id && sound_fd >= 0)
{
/* Why the hell is this symbol not in esd? */
/* it's in esd.h - evil evil evil */
/* esd_sample_kill(sound_fd,s->id); */
esd_sample_free(sound_fd, s->id);
}
if (s->data)
Efree(s->data);
if (s->file)
Efree(s->file);
if (s)
Efree(s);
}
static void
_esd_Play(Sample * s)
{
int size, confirm = 0;
if (sound_fd < 0 || !s)
return;
if (!s->id && s->data)
{
size = s->samples;
s->id = esd_sample_getid(sound_fd, s->file);
if (s->id < 0)
{
s->id =
esd_sample_cache(sound_fd, s->format, s->rate, size, s->file);
write(sound_fd, s->data, size);
confirm = esd_confirm_sample_cache(sound_fd);
if (confirm != s->id)
s->id = 0;
}
Efree(s->data);
s->data = NULL;
}
if (s->id > 0)
esd_sample_play(sound_fd, s->id);
}
static int
_esd_Init(void)
{
if (sound_fd >= 0)
return 0;
sound_fd = esd_open_sound(NULL);
return sound_fd < 0;
}
static void
_esd_Exit(void)
{
if (sound_fd < 0)
return;
close(sound_fd);
sound_fd = -1;
}
const SoundOps SoundOps_esd = {
_esd_Init, _esd_Exit, _esd_Load, _esd_Destroy, _esd_Play,
};
#endif /* HAVE_SOUND && HAVE_LIBESD */