niimaq: use better property name for size of ring buffer

This commit is contained in:
Joshua M. Doe 2013-01-25 14:53:11 -05:00
parent 6c745ca706
commit 7d15dafeb4

View File

@ -62,12 +62,12 @@ enum
{ {
PROP_0, PROP_0,
PROP_INTERFACE, PROP_INTERFACE,
PROP_BUFSIZE, PROP_RING_BUFFER_COUNT,
PROP_AVOID_COPY PROP_AVOID_COPY
}; };
#define DEFAULT_PROP_INTERFACE "img0" #define DEFAULT_PROP_INTERFACE "img0"
#define DEFAULT_PROP_BUFSIZE 10 #define DEFAULT_PROP_RING_BUFFER_COUNT 3
#define DEFAULT_PROP_AVOID_COPY FALSE #define DEFAULT_PROP_AVOID_COPY FALSE
static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src", static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
@ -475,14 +475,14 @@ gst_niimaqsrc_class_init (GstNiImaqSrcClass * klass)
"Interface", "Interface",
"NI-IMAQ interface to open", DEFAULT_PROP_INTERFACE, "NI-IMAQ interface to open", DEFAULT_PROP_INTERFACE,
G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE)); G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE));
g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_BUFSIZE, g_object_class_install_property (G_OBJECT_CLASS (klass),
g_param_spec_int ("buffer-size", PROP_RING_BUFFER_COUNT, g_param_spec_int ("ring-buffer-count",
"Number of frames in the IMAQ ringbuffer", "Number of frames in the IMAQ ringbuffer",
"The number of frames in the IMAQ ringbuffer", 1, G_MAXINT, "The number of frames in the IMAQ ringbuffer", 1, G_MAXINT,
DEFAULT_PROP_BUFSIZE, G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE)); DEFAULT_PROP_RING_BUFFER_COUNT,
G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE));
g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_AVOID_COPY, g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_AVOID_COPY,
g_param_spec_boolean ("avoid-copy", g_param_spec_boolean ("avoid-copy", "Avoid copying",
"Avoid copying",
"Whether to avoid copying (do not use with queues)", "Whether to avoid copying (do not use with queues)",
DEFAULT_PROP_AVOID_COPY, G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE)); DEFAULT_PROP_AVOID_COPY, G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE));
@ -518,7 +518,7 @@ gst_niimaqsrc_init (GstNiImaqSrc * niimaqsrc, GstNiImaqSrcClass * g_class)
niimaqsrc->mutex = g_mutex_new (); niimaqsrc->mutex = g_mutex_new ();
/* initialize properties */ /* initialize properties */
niimaqsrc->bufsize = DEFAULT_PROP_BUFSIZE; niimaqsrc->bufsize = DEFAULT_PROP_RING_BUFFER_COUNT;
niimaqsrc->interface_name = g_strdup (DEFAULT_PROP_INTERFACE); niimaqsrc->interface_name = g_strdup (DEFAULT_PROP_INTERFACE);
niimaqsrc->avoid_copy = DEFAULT_PROP_AVOID_COPY; niimaqsrc->avoid_copy = DEFAULT_PROP_AVOID_COPY;
} }
@ -562,7 +562,7 @@ gst_niimaqsrc_set_property (GObject * object, guint prop_id,
g_free (niimaqsrc->interface_name); g_free (niimaqsrc->interface_name);
niimaqsrc->interface_name = g_strdup (g_value_get_string (value)); niimaqsrc->interface_name = g_strdup (g_value_get_string (value));
break; break;
case PROP_BUFSIZE: case PROP_RING_BUFFER_COUNT:
niimaqsrc->bufsize = g_value_get_int (value); niimaqsrc->bufsize = g_value_get_int (value);
break; break;
case PROP_AVOID_COPY: case PROP_AVOID_COPY:
@ -583,7 +583,7 @@ gst_niimaqsrc_get_property (GObject * object, guint prop_id, GValue * value,
case PROP_INTERFACE: case PROP_INTERFACE:
g_value_set_string (value, niimaqsrc->interface_name); g_value_set_string (value, niimaqsrc->interface_name);
break; break;
case PROP_BUFSIZE: case PROP_RING_BUFFER_COUNT:
g_value_set_int (value, niimaqsrc->bufsize); g_value_set_int (value, niimaqsrc->bufsize);
break; break;
case PROP_AVOID_COPY: case PROP_AVOID_COPY: