summaryrefslogtreecommitdiffstats
path: root/ext/gsm/gstgsmenc.h
diff options
context:
space:
mode:
authorMaciej Katafiasz <mathrick@mathrick.org>2005-01-24 21:57:15 +0000
committerMaciej Katafiasz <mathrick@mathrick.org>2005-01-24 21:57:15 +0000
commit9d608aed4da8cf0bfc96f348c5d70f64e4b51168 (patch)
tree57d292a5e31248f2f5553e2f40942849e1782de6 /ext/gsm/gstgsmenc.h
parent5c88ccad34797478f5e7fc9ed4f17648a2918732 (diff)
downloadgst-plugins-bad-9d608aed4da8cf0bfc96f348c5d70f64e4b51168.tar.gz
gst-plugins-bad-9d608aed4da8cf0bfc96f348c5d70f64e4b51168.tar.bz2
gst-plugins-bad-9d608aed4da8cf0bfc96f348c5d70f64e4b51168.zip
Apply patch from Jeffrey C. Ollie. Fixes rate (now always 8kHz) and adds timestamps
Original commit message from CVS: Apply patch from Jeffrey C. Ollie. Fixes rate (now always 8kHz) and adds timestamps
Diffstat (limited to 'ext/gsm/gstgsmenc.h')
-rw-r--r--ext/gsm/gstgsmenc.h29
1 files changed, 10 insertions, 19 deletions
diff --git a/ext/gsm/gstgsmenc.h b/ext/gsm/gstgsmenc.h
index 2366ed69..cfc88722 100644
--- a/ext/gsm/gstgsmenc.h
+++ b/ext/gsm/gstgsmenc.h
@@ -17,11 +17,9 @@
* Boston, MA 02111-1307, USA.
*/
-
#ifndef __GST_GSMENC_H__
#define __GST_GSMENC_H__
-
#include <gst/gst.h>
#ifdef GSM_HEADER_IN_SUBDIR
@@ -30,10 +28,7 @@
#include <gsm.h>
#endif
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
#define GST_TYPE_GSMENC \
(gst_gsmenc_get_type())
@@ -49,33 +44,29 @@ extern "C" {
typedef struct _GstGSMEnc GstGSMEnc;
typedef struct _GstGSMEncClass GstGSMEncClass;
-struct _GstGSMEnc {
+struct _GstGSMEnc
+{
GstElement element;
/* pads */
- GstPad *sinkpad,*srcpad;
+ GstPad *sinkpad, *srcpad;
gsm state;
gsm_signal buffer[160];
gint bufsize;
-
- guint64 next_ts;
- gint rate;
+ GstClockTime next_ts;
};
-struct _GstGSMEncClass {
+struct _GstGSMEncClass
+{
GstElementClass parent_class;
/* signals */
- void (*frame_encoded) (GstElement *element);
+ void (*frame_encoded) (GstElement * element);
};
-GType gst_gsmenc_get_type(void);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+GType gst_gsmenc_get_type (void);
+G_END_DECLS
#endif /* __GST_GSMENC_H__ */