- some of my pending cleanups
Original commit message from CVS: - some of my pending cleanups
This commit is contained in:
Wim Taymans
parent
4d96d4aa91
commit
5f51e20e49
@ -17,12 +17,11 @@
|
||||
* Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
/* #define GST_DEBUG_ENABLED */
|
||||
|
||||
#include "gstcdplayer.h"
|
||||
|
||||
/* props */
|
||||
enum {
|
||||
enum
|
||||
{
|
||||
ARG_0,
|
||||
ARG_DEVICE,
|
||||
ARG_NUM_TRACKS,
|
||||
@ -33,40 +32,41 @@ enum {
|
||||
};
|
||||
|
||||
/* signals */
|
||||
enum {
|
||||
enum
|
||||
{
|
||||
TRACK_CHANGE,
|
||||
LAST_SIGNAL,
|
||||
};
|
||||
|
||||
static void cdplayer_class_init (CDPlayerClass *klass);
|
||||
static void cdplayer_init (CDPlayer *cdp);
|
||||
static void cdplayer_set_property(GObject *object,guint prop_id,const GValue *value,GParamSpec *spec);
|
||||
static void cdplayer_get_property(GObject *object,guint prop_id,GValue *value,GParamSpec *spec);
|
||||
static void cdplayer_dispose (GObject *object);
|
||||
|
||||
static void cdplayer_set_property (GObject *object, guint prop_id,
|
||||
const GValue *value, GParamSpec *spec);
|
||||
static void cdplayer_get_property (GObject *object, guint prop_id,
|
||||
GValue *value, GParamSpec *spec);
|
||||
static gboolean cdplayer_iterate (GstBin *bin);
|
||||
static GstElementStateReturn cdplayer_change_state(GstElement *element);
|
||||
|
||||
static gboolean plugin_init(GModule *module,GstPlugin *plugin);
|
||||
|
||||
|
||||
static GstElementStateReturn
|
||||
cdplayer_change_state (GstElement * element);
|
||||
|
||||
static GstElementClass *parent_class;
|
||||
static guint cdplayer_signals[LAST_SIGNAL] = { 0 };
|
||||
|
||||
|
||||
static GstElementDetails cdplayer_details = {
|
||||
"CD Player",
|
||||
"Generic/Bin",
|
||||
"LGPL",
|
||||
"Play CD audio through the CD Drive",
|
||||
VERSION,
|
||||
"Charles Schmidt <cbschmid@uiuc.edu>",
|
||||
"Wim Taymans <wim.taymans@chello.be>",
|
||||
"(C) 2002",
|
||||
};
|
||||
|
||||
|
||||
|
||||
GType cdplayer_get_type(void)
|
||||
GType
|
||||
cdplayer_get_type (void)
|
||||
{
|
||||
static GType cdplayer_type = 0;
|
||||
|
||||
@ -90,7 +90,8 @@ GType cdplayer_get_type(void)
|
||||
return cdplayer_type;
|
||||
}
|
||||
|
||||
static void cdplayer_class_init(CDPlayerClass *klass)
|
||||
static void
|
||||
cdplayer_class_init (CDPlayerClass * klass)
|
||||
{
|
||||
GObjectClass *gobject_klass;
|
||||
GstElementClass *gstelement_klass;
|
||||
@ -107,22 +108,43 @@ static void cdplayer_class_init(CDPlayerClass *klass)
|
||||
gstelement_klass->change_state = GST_DEBUG_FUNCPTR (cdplayer_change_state);
|
||||
gstbin_klass->iterate = GST_DEBUG_FUNCPTR (cdplayer_iterate);
|
||||
|
||||
g_object_class_install_property(gobject_klass,ARG_DEVICE,g_param_spec_string("device","device","CDROM device",NULL,G_PARAM_READWRITE));
|
||||
g_object_class_install_property(gobject_klass,ARG_NUM_TRACKS,g_param_spec_int("num_tracks","num_tracks","Number of Tracks",G_MININT,G_MAXINT,0,G_PARAM_READABLE));
|
||||
g_object_class_install_property(gobject_klass,ARG_START_TRACK,g_param_spec_int("start_track","start_track","Track to start playback on",1,CDPLAYER_MAX_TRACKS-1,1,G_PARAM_READWRITE));
|
||||
g_object_class_install_property(gobject_klass,ARG_END_TRACK,g_param_spec_int("end_track","end_track","Track to end playback on",0,CDPLAYER_MAX_TRACKS-1,0,G_PARAM_READWRITE));
|
||||
g_object_class_install_property(gobject_klass,ARG_CURRENT_TRACK,g_param_spec_int("current_track","current_track","Current track playing",1,CDPLAYER_MAX_TRACKS-1,1,G_PARAM_READABLE));
|
||||
g_object_class_install_property(gobject_klass,ARG_CDDB_DISCID,g_param_spec_uint("cddb_discid","cddb_discid","CDDB Disc ID",0,G_MAXUINT,1,G_PARAM_READABLE));
|
||||
|
||||
cdplayer_signals[TRACK_CHANGE] = g_signal_new("track_change",G_TYPE_FROM_CLASS(klass),G_SIGNAL_RUN_LAST,G_STRUCT_OFFSET(CDPlayerClass,track_change),NULL,NULL,gst_marshal_VOID__INT,G_TYPE_NONE,1,G_TYPE_INT);
|
||||
|
||||
gobject_klass->set_property = cdplayer_set_property;
|
||||
gobject_klass->get_property = cdplayer_get_property;
|
||||
|
||||
g_object_class_install_property (gobject_klass, ARG_DEVICE,
|
||||
g_param_spec_string ("device", "device", "CDROM device", NULL,
|
||||
G_PARAM_READWRITE));
|
||||
g_object_class_install_property (gobject_klass, ARG_NUM_TRACKS,
|
||||
g_param_spec_int ("num_tracks", "num_tracks", "Number of Tracks",
|
||||
G_MININT, G_MAXINT, 0, G_PARAM_READABLE));
|
||||
g_object_class_install_property (gobject_klass, ARG_START_TRACK,
|
||||
g_param_spec_int ("start_track", "start_track",
|
||||
"Track to start playback on", 1,
|
||||
CDPLAYER_MAX_TRACKS - 1, 1,
|
||||
G_PARAM_READWRITE));
|
||||
g_object_class_install_property (gobject_klass, ARG_END_TRACK,
|
||||
g_param_spec_int ("end_track", "end_track",
|
||||
"Track to end playback on", 0,
|
||||
CDPLAYER_MAX_TRACKS - 1, 0,
|
||||
G_PARAM_READWRITE));
|
||||
g_object_class_install_property (gobject_klass, ARG_CURRENT_TRACK,
|
||||
g_param_spec_int ("current_track", "current_track",
|
||||
"Current track playing", 1,
|
||||
CDPLAYER_MAX_TRACKS - 1, 1, G_PARAM_READABLE));
|
||||
g_object_class_install_property (gobject_klass, ARG_CDDB_DISCID,
|
||||
g_param_spec_uint ("cddb_discid", "cddb_discid", "CDDB Disc ID",
|
||||
0, G_MAXUINT, 1, G_PARAM_READABLE));
|
||||
|
||||
cdplayer_signals[TRACK_CHANGE] =
|
||||
g_signal_new ("track_change", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST,
|
||||
G_STRUCT_OFFSET (CDPlayerClass, track_change), NULL, NULL,
|
||||
gst_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
static void cdplayer_init(CDPlayer *cdp)
|
||||
static void
|
||||
cdplayer_init (CDPlayer * cdp)
|
||||
{
|
||||
cdp->device = g_strdup ("/dev/cdrom");
|
||||
cdp->num_tracks = -1;
|
||||
@ -132,12 +154,13 @@ static void cdplayer_init(CDPlayer *cdp)
|
||||
|
||||
cdp->paused = FALSE;
|
||||
|
||||
// GST_FLAG_SET(cdp,GST_BIN_FLAG_MANAGER);
|
||||
GST_FLAG_SET (cdp, GST_BIN_FLAG_MANAGER);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
static void cdplayer_set_property(GObject *object,guint prop_id,const GValue *value,GParamSpec *spec)
|
||||
static void
|
||||
cdplayer_set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * spec)
|
||||
{
|
||||
CDPlayer *cdp;
|
||||
|
||||
@ -171,7 +194,8 @@ static void cdplayer_set_property(GObject *object,guint prop_id,const GValue *va
|
||||
}
|
||||
|
||||
|
||||
static void cdplayer_get_property(GObject *object,guint prop_id,GValue *value,GParamSpec *spec)
|
||||
static void
|
||||
cdplayer_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * spec)
|
||||
{
|
||||
CDPlayer *cdp;
|
||||
|
||||
@ -203,7 +227,8 @@ static void cdplayer_get_property(GObject *object,guint prop_id,GValue *value,GP
|
||||
return;
|
||||
}
|
||||
|
||||
static void cdplayer_dispose(GObject *object)
|
||||
static void
|
||||
cdplayer_dispose (GObject * object)
|
||||
{
|
||||
CDPlayer *cdp;
|
||||
|
||||
@ -219,7 +244,8 @@ static void cdplayer_dispose(GObject *object)
|
||||
return;
|
||||
}
|
||||
|
||||
static gboolean cdplayer_iterate(GstBin *bin)
|
||||
static gboolean
|
||||
cdplayer_iterate (GstBin * bin)
|
||||
{
|
||||
CDPlayer *cdp = CDPLAYER (bin);
|
||||
gint current_track;
|
||||
@ -253,7 +279,8 @@ static gboolean cdplayer_iterate(GstBin *bin)
|
||||
}
|
||||
|
||||
|
||||
static GstElementStateReturn cdplayer_change_state(GstElement *element)
|
||||
static GstElementStateReturn
|
||||
cdplayer_change_state (GstElement * element)
|
||||
{
|
||||
CDPlayer *cdp;
|
||||
GstElementState state = GST_STATE (element);
|
||||
@ -317,7 +344,8 @@ static GstElementStateReturn cdplayer_change_state(GstElement *element)
|
||||
}
|
||||
|
||||
|
||||
static gboolean plugin_init(GModule *module,GstPlugin *plugin)
|
||||
static gboolean
|
||||
plugin_init (GModule * module, GstPlugin * plugin)
|
||||
{
|
||||
GstElementFactory *factory;
|
||||
|
||||
@ -337,6 +365,3 @@ GstPluginDesc plugin_desc = {
|
||||
"cdplayer",
|
||||
plugin_init
|
||||
};
|
||||
|
||||
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user