applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cleanups, and warning fixes

Browse source 
2004-06-15  Bastien Nocera  <hadess@hadess.net>

	* actions/acme-fb-level.c: (acme_fblevel_init):
	* actions/acme-volume-alsa.c: (acme_volume_alsa_init),
	(acme_volume_alsa_class_init):
	* actions/acme-volume-gstreamer.c: (acme_volume_gstreamer_init):
	* actions/acme-volume-oss.c: (acme_volume_oss_init),
	(acme_volume_oss_class_init):
	* actions/acme-volume.c: (acme_volume_class_init),
	(acme_volume_init): cleanups, and warning fixes

2004-06-15  Bastien Nocera  <hadess@hadess.net>

	* .cvsignore: upd
This commit is contained in:
Bastien Nocera 2004-06-15 15:39:36 +00:00 • committed by Bastien Nocera
parent 081a3dd302
commit 6be6e425ed
8 changed files with 32 additions and 156 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
capplets/mouse/.cvsignore
View file

@ -6,4 +6,4 @@ Makefile.in
*.lo
*.la
gnome-mouse-properties
mouse.desktop
*.desktop

4
capplets/mouse/ChangeLog
View file

@ -1,3 +1,7 @@
2004-06-15 Bastien Nocera <hadess@hadess.net>
* .cvsignore: upd
2004-04-15 Jody Goldberg <jody@gnome.org>
* Release 2.6.1

11
gnome-settings-daemon/ChangeLog
View file

@ -1,3 +1,14 @@
2004-06-15 Bastien Nocera <hadess@hadess.net>
* actions/acme-fb-level.c: (acme_fblevel_init):
* actions/acme-volume-alsa.c: (acme_volume_alsa_init),
(acme_volume_alsa_class_init):
* actions/acme-volume-gstreamer.c: (acme_volume_gstreamer_init):
* actions/acme-volume-oss.c: (acme_volume_oss_init),
(acme_volume_oss_class_init):
* actions/acme-volume.c: (acme_volume_class_init),
(acme_volume_init): cleanups, and warning fixes
2004-04-15 Jody Goldberg <jody@gnome.org>
* Release 2.6.1

24
gnome-settings-daemon/actions/acme-fb-level.c
View file

@ -40,6 +40,8 @@
#define PMU_IOC_GRAB_BACKLIGHT _IOR('B', 6, 0)
#endif
G_DEFINE_TYPE (AcmeFblevel, acme_fblevel, ACME_TYPE_FBLEVEL)
struct AcmeFblevelPrivate {
int pmu_fd;
int saved_level;
@ -82,28 +84,6 @@ acme_fblevel_init (AcmeFblevel *fblevel)
return;
}
GType acme_fblevel_get_type (void)
{
static GType type = 0;
if (type == 0) {
static const GTypeInfo info = {
sizeof (AcmeFblevelClass),
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
(GClassInitFunc) acme_fblevel_class_init,
(GClassFinalizeFunc) NULL,
NULL /* class_data */,
sizeof (AcmeFblevel),
0 /* n_preallocs */,
(GInstanceInitFunc) acme_fblevel_init,
};
type = g_type_register_static (G_TYPE_OBJECT, "AcmeFblevel",
&info, (GTypeFlags)0);
}
return type;
}
int
acme_fblevel_get_level (AcmeFblevel *self)
{

56
gnome-settings-daemon/actions/acme-volume-alsa.c
View file

@ -40,7 +40,6 @@
struct AcmeVolumeAlsaPrivate
{
gboolean use_pcm;
long pmin, pmax;
snd_mixer_t *handle;
snd_mixer_elem_t *elem;
@ -53,6 +52,8 @@ static GObjectClass *parent_class = NULL;
static int acme_volume_alsa_get_volume (AcmeVolume *self);
static void acme_volume_alsa_set_volume (AcmeVolume *self, int val);
G_DEFINE_TYPE (AcmeVolumeAlsa, acme_volume_alsa, ACME_TYPE_VOLUME)
static void
acme_volume_alsa_finalize (GObject *object)
{
@ -69,30 +70,6 @@ acme_volume_alsa_finalize (GObject *object)
G_OBJECT_CLASS (parent_class)->finalize (object);
}
static void
acme_volume_alsa_set_use_pcm (AcmeVolume *vol, gboolean val)
{
snd_mixer_selem_id_t *sid = NULL;
snd_mixer_elem_t *elem;
AcmeVolumeAlsa *self = (AcmeVolumeAlsa *) vol;
self->_priv->use_pcm = val;
snd_mixer_selem_id_alloca(&sid);
snd_mixer_selem_id_set_name (sid, (val?"PCM":"Master"));
elem = snd_mixer_find_selem(self->_priv->handle, sid);
if (!elem)
{
D("snd_mixer_find_selem");
}
else
{
self->_priv->elem = elem;
}
}
static void
acme_volume_alsa_set_mute (AcmeVolume *vol, gboolean val)
{
@ -161,9 +138,8 @@ acme_volume_alsa_set_volume (AcmeVolume *vol, int val)
}
static void
acme_volume_alsa_init (AcmeVolume *vol)
acme_volume_alsa_init (AcmeVolumeAlsa *self)
{
AcmeVolumeAlsa *self = (AcmeVolumeAlsa *) vol;
snd_mixer_selem_id_t *sid;
snd_mixer_t *handle;
snd_mixer_elem_t *elem;
@ -236,29 +212,3 @@ acme_volume_alsa_class_init (AcmeVolumeAlsaClass *klass)
volume_class->get_mute = acme_volume_alsa_get_mute;
}
GType acme_volume_alsa_get_type (void)
{
static GType object_type = 0;
if (!object_type)
{
static const GTypeInfo object_info =
{
sizeof (AcmeVolumeAlsaClass),
NULL, /* base_init */
NULL, /* base_finalize */
(GClassInitFunc) acme_volume_alsa_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (AcmeVolumeAlsa),
0, /* n_preallocs */
(GInstanceInitFunc) acme_volume_alsa_init
};
object_type = g_type_register_static (ACME_TYPE_VOLUME,
"AcmeVolumeAlsa", &object_info, 0);
}
return object_type;
}

34
gnome-settings-daemon/actions/acme-volume-gstreamer.c
View file

@ -31,6 +31,8 @@
#include <gst/mixer/mixer.h>
#include <gst/propertyprobe/propertyprobe.h>
#include <string.h>
struct AcmeVolumeGStreamerPrivate
{
GstMixer *mixer;
@ -39,6 +41,8 @@ struct AcmeVolumeGStreamerPrivate
static GObjectClass *parent_class = NULL;
G_DEFINE_TYPE (AcmeVolumeGStreamer, acme_volume_gstreamer, ACME_TYPE_VOLUME)
static int acme_volume_gstreamer_get_volume (AcmeVolume *self);
static void acme_volume_gstreamer_set_volume (AcmeVolume *self, int val);
@ -141,11 +145,10 @@ acme_volume_gstreamer_set_volume (AcmeVolume *vol, int val)
/* This is a modified version of code from gnome-media's gst-mixer */
static void
acme_volume_gstreamer_init (AcmeVolume *vol)
acme_volume_gstreamer_init (AcmeVolumeGStreamer *self)
{
AcmeVolumeGStreamer *self = (AcmeVolumeGStreamer *) vol;
const GList *elements;
gint num = 0, channel_count = 0;
gint num = 0;
self->_priv = g_new0 (AcmeVolumeGStreamerPrivate, 1);
@ -254,28 +257,3 @@ acme_volume_gstreamer_class_init (AcmeVolumeGStreamerClass *klass)
volume_class->get_mute = acme_volume_gstreamer_get_mute;
}
GType acme_volume_gstreamer_get_type (void)
{
static GType object_type = 0;
if (!object_type)
{
static const GTypeInfo object_info =
{
sizeof (AcmeVolumeGStreamerClass),
NULL, /* base_init */
NULL, /* base_finalize */
(GClassInitFunc) acme_volume_gstreamer_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (AcmeVolumeGStreamer),
0, /* n_preallocs */
(GInstanceInitFunc) acme_volume_gstreamer_init
};
object_type = g_type_register_static (ACME_TYPE_VOLUME,
"AcmeVolumeGStreamer", &object_info, 0);
}
return object_type;
}

31
gnome-settings-daemon/actions/acme-volume-oss.c
View file

@ -49,6 +49,8 @@ static int acme_volume_oss_get_volume (AcmeVolume *self);
static void acme_volume_oss_set_volume (AcmeVolume *self, int val);
static gboolean acme_volume_oss_mixer_check (AcmeVolumeOss *self, int fd);
G_DEFINE_TYPE (AcmeVolumeOss, acme_volume_oss, ACME_TYPE_VOLUME)
static void
acme_volume_oss_finalize (GObject *object)
{
@ -152,9 +154,8 @@ acme_volume_oss_set_volume (AcmeVolume *vol, int val)
}
static void
acme_volume_oss_init (AcmeVolume *vol)
acme_volume_oss_init (AcmeVolumeOss *self)
{
AcmeVolumeOss *self = (AcmeVolumeOss *) vol;
int fd;
self->_priv = g_new0 (AcmeVolumeOssPrivate, 1);
@ -192,32 +193,6 @@ acme_volume_oss_class_init (AcmeVolumeOssClass *klass)
volume_class->get_mute = acme_volume_oss_get_mute;
}
GType acme_volume_oss_get_type (void)
{
static GType object_type = 0;
if (!object_type)
{
static const GTypeInfo object_info =
{
sizeof (AcmeVolumeOssClass),
NULL, /* base_init */
NULL, /* base_finalize */
(GClassInitFunc) acme_volume_oss_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (AcmeVolumeOss),
0, /* n_preallocs */
(GInstanceInitFunc) acme_volume_oss_init
};
object_type = g_type_register_static (ACME_TYPE_VOLUME,
"AcmeVolumeOss", &object_info, 0);
}
return object_type;
}
static gboolean
acme_volume_oss_mixer_check (AcmeVolumeOss *self, int fd)
{

26
gnome-settings-daemon/actions/acme-volume.c
View file

@ -35,11 +35,11 @@
static GObjectClass *parent_class = NULL;
G_DEFINE_TYPE (AcmeVolume, acme_volume, ACME_TYPE_VOLUME)
static void
acme_volume_class_init (AcmeVolumeClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
};
@ -48,28 +48,6 @@ acme_volume_init (AcmeVolume *vol)
{
}
GType acme_volume_get_type (void)
{
static GType type = 0;
if (type == 0) {
static const GTypeInfo info = {
sizeof (AcmeVolumeClass),
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
(GClassInitFunc) acme_volume_class_init,
(GClassFinalizeFunc) NULL,
NULL /* class_data */,
sizeof (AcmeVolume),
0 /* n_preallocs */,
(GInstanceInitFunc) acme_volume_init
};
type = g_type_register_static (G_TYPE_OBJECT, "AcmeVolume",
&info, (GTypeFlags)0);
}
return type;
}
int
acme_volume_get_volume (AcmeVolume *self)
{