Skip to content

GitLab

G
gst-plugins-good
Commit da8915bf authored by Thomas Vander Stichele's avatar Thomas Vander Stichele
Browse files
Options

more macro splitting; fix po problem 

Original commit message from CVS:
more macro splitting; fix po problem
parent 81dae26a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1634 additions and 2270 deletions
ChangeLog
View file @ da8915bf
2005-07-10 Thomas Vander Stichele <thomas at apestaart dot org>
* ext/aalib/gstaasink.c: (gst_aasink_get_type),
(gst_aasink_class_init), (gst_aasink_init):
* ext/esd/esdsink.c: (gst_esdsink_get_type),
(gst_esdsink_class_init):
* ext/libcaca/gstcacasink.c: (gst_cacasink_get_type),
(gst_cacasink_class_init), (gst_cacasink_init):
* ext/shout2/gstshout2.c: (gst_shout2send_get_type),
(gst_shout2send_class_init), (gst_shout2send_init):
* gst/udp/gstdynudpsink.c: (gst_dynudpsink_get_type),
(gst_dynudpsink_class_init):
* gst/udp/gstmultiudpsink.c: (gst_multiudpsink_get_type),
(gst_multiudpsink_class_init):
more macro splitting
2005-07-08 Andy Wingo <wingo@pobox.com>
* sys/oss/: Port from THREADED+wim's fixes.
......
common @ ac7272b7
Subproject commit 221ac8abacb46858382a9f8c924152ae588f4a2e
Subproject commit ac7272b7af934c2294a44ac1c0f3fac3f8d17ec6
configure.ac
View file @ da8915bf
......@@ -552,6 +552,7 @@ ext/raw1394/Makefile
ext/shout2/Makefile
ext/sidplay/Makefile
ext/esd/Makefile
po/Makefile.in
common/Makefile
common/m4/Makefile
m4/Makefile
......
ext/aalib/gstaasink.c
View file @ da8915bf
......@@ -105,7 +105,7 @@ gst_aasink_get_type (void)
};
aasink_type =
g_type_register_static (GST_TYPE_BASESINK, "GstAASink", &aasink_info,
g_type_register_static (GST_TYPE_BASE_SINK, "GstAASink", &aasink_info,
0);
}
return aasink_type;
......@@ -196,7 +196,7 @@ gst_aasink_class_init (GstAASinkClass * klass)
gstelement_class = (GstElementClass *) klass;
gstbasesink_class = (GstBaseSinkClass *) klass;
parent_class = g_type_class_ref (GST_TYPE_BASESINK);
parent_class = g_type_class_ref (GST_TYPE_BASE_SINK);
gobject_class->set_property = gst_aasink_set_property;
gobject_class->get_property = gst_aasink_get_property;
......@@ -271,7 +271,7 @@ gst_aasink_init (GstAASink * aasink)
{
GstPad *pad;
pad = GST_BASESINK_PAD (aasink);
pad = GST_BASE_SINK_PAD (aasink);
gst_pad_set_fixatecaps_function (pad, gst_aasink_fixate);
memcpy (&aasink->ascii_surf, &aa_defparams,
......
ext/esd/esdsink.c
View file @ da8915bf
......@@ -106,8 +106,8 @@ gst_esdsink_get_type (void)
};
esdsink_type =
g_type_register_static (GST_TYPE_AUDIOSINK, "GstEsdSink", &esdsink_info,
0);
g_type_register_static (GST_TYPE_AUDIO_SINK, "GstEsdSink",
&esdsink_info, 0);
}
return esdsink_type;
}
......@@ -137,7 +137,7 @@ gst_esdsink_class_init (GstEsdSinkClass * klass)
gstbaseaudiosink_class = (GstBaseAudioSinkClass *) klass;
gstaudiosink_class = (GstAudioSinkClass *) klass;
parent_class = g_type_class_ref (GST_TYPE_AUDIOSINK);
parent_class = g_type_class_ref (GST_TYPE_AUDIO_SINK);
gobject_class->dispose = gst_esdsink_dispose;
......
ext/libcaca/gstcacasink.c
View file @ da8915bf
......@@ -95,7 +95,7 @@ gst_cacasink_get_type (void)
};
cacasink_type =
g_type_register_static (GST_TYPE_BASESINK, "GstCACASink",
g_type_register_static (GST_TYPE_BASE_SINK, "GstCACASink",
&cacasink_info, 0);
}
return cacasink_type;
......@@ -154,7 +154,7 @@ gst_cacasink_class_init (GstCACASinkClass * klass)
gstelement_class = (GstElementClass *) klass;
gstbasesink_class = (GstBaseSinkClass *) klass;
parent_class = g_type_class_ref (GST_TYPE_BASESINK);
parent_class = g_type_class_ref (GST_TYPE_BASE_SINK);
gobject_class->set_property = gst_cacasink_set_property;
gobject_class->get_property = gst_cacasink_get_property;
......@@ -240,7 +240,7 @@ gst_cacasink_init (GstCACASink * cacasink)
{
GstPad *pad;
pad = GST_BASESINK_PAD (cacasink);
pad = GST_BASE_SINK_PAD (cacasink);
/* gst_pad_set_fixatecaps_function (pad, gst_cacasink_fixate); */
cacasink->screen_width = GST_CACA_DEFAULT_SCREEN_WIDTH;
......
ext/shout2/gstshout2.c
View file @ da8915bf
......@@ -136,7 +136,7 @@ gst_shout2send_get_type (void)
};
shout2send_type =
g_type_register_static (GST_TYPE_BASESINK, "GstShout2send",
g_type_register_static (GST_TYPE_BASE_SINK, "GstShout2send",
&shout2send_info, 0);
g_type_add_interface_static (shout2send_type, GST_TYPE_TAG_SETTER,
......@@ -166,7 +166,7 @@ gst_shout2send_class_init (GstShout2sendClass * klass)
gobject_class = (GObjectClass *) klass;
gstbasesink_class = (GstBaseSinkClass *) klass;
parent_class = g_type_class_ref (GST_TYPE_BASESINK);
parent_class = g_type_class_ref (GST_TYPE_BASE_SINK);
gobject_class->set_property = gst_shout2send_set_property;
gobject_class->get_property = gst_shout2send_get_property;
......@@ -216,7 +216,7 @@ gst_shout2send_init (GstShout2send * shout2send)
{
GstPad *pad;
pad = GST_BASESINK_PAD (shout2send);
pad = GST_BASE_SINK_PAD (shout2send);
gst_pad_set_setcaps_function (pad, gst_shout2send_setcaps);
shout2send->clock = NULL;
......
gst/udp/gstdynudpsink.c
View file @ da8915bf
......@@ -98,7 +98,7 @@ gst_dynudpsink_get_type (void)
};
dynudpsink_type =
g_type_register_static (GST_TYPE_BASESINK, "GstDynUDPSink",
g_type_register_static (GST_TYPE_BASE_SINK, "GstDynUDPSink",
&dynudpsink_info, 0);
}
return dynudpsink_type;
......@@ -126,7 +126,7 @@ gst_dynudpsink_class_init (GstDynUDPSink * klass)
gstelement_class = (GstElementClass *) klass;
gstbasesink_class = (GstBaseSinkClass *) klass;
parent_class = g_type_class_ref (GST_TYPE_BASESINK);
parent_class = g_type_class_ref (GST_TYPE_BASE_SINK);
gobject_class->set_property = gst_dynudpsink_set_property;
gobject_class->get_property = gst_dynudpsink_get_property;
......
gst/udp/gstmultiudpsink.c
View file @ da8915bf
......@@ -102,7 +102,7 @@ gst_multiudpsink_get_type (void)
};
multiudpsink_type =
g_type_register_static (GST_TYPE_BASESINK, "GstMultiUDPSink",
g_type_register_static (GST_TYPE_BASE_SINK, "GstMultiUDPSink",
&multiudpsink_info, 0);
}
return multiudpsink_type;
......@@ -130,7 +130,7 @@ gst_multiudpsink_class_init (GstMultiUDPSink * klass)
gstelement_class = (GstElementClass *) klass;
gstbasesink_class = (GstBaseSinkClass *) klass;
parent_class = g_type_class_ref (GST_TYPE_BASESINK);
parent_class = g_type_class_ref (GST_TYPE_BASE_SINK);
gobject_class->set_property = gst_multiudpsink_set_property;
gobject_class->get_property = gst_multiudpsink_get_property;
......
po/POTFILES.in
View file @ da8915bf
ext/alsa/gstalsamixertrack.c
ext/audiofile/gstafsink.c
ext/audiofile/gstafsrc.c
ext/cdparanoia/gstcdparanoia.c
ext/gnomevfs/gstgnomevfssrc.c
ext/gnomevfs/gstgnomevfssink.c
ext/sndfile/gstsf.c
gst/avi/gstavimux.c
gst-libs/gst/play/play.c
sys/dxr3/dxr3audiosink.c
sys/dxr3/dxr3audiosink.c
sys/dxr3/dxr3videosink.c
sys/oss/gstosselement.c
sys/oss/gstossmixer.c
sys/v4l/v4l_calls.c
sys/v4l/v4l_calls.h
sys/v4l2/v4l2_calls.c
sys/v4l2/v4l2src_calls.c
po/af.po
View file @ da8915bf
This diff is collapsed.
po/az.po
View file @ da8915bf
This diff is collapsed.
po/cs.po
View file @ da8915bf
This diff is collapsed.
po/en_GB.po
View file @ da8915bf
This diff is collapsed.
po/hu.po
View file @ da8915bf
This diff is collapsed.
po/it.po
View file @ da8915bf
This diff is collapsed.
po/nb.po
View file @ da8915bf
......@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gst-plugins 0.8.3\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2005-01-28 12:07+0100\n"
"POT-Creation-Date: 2005-07-10 14:49+0200\n"
"PO-Revision-Date: 2004-10-04 15:54+0200\n"
"Last-Translator: Kjartan Maraas <kmaraas@broadpark.no>\n"
"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
......@@ -14,101 +14,21 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: ext/alsa/gstalsamixertrack.c:83
msgid "Master"
msgstr ""
#: ext/alsa/gstalsamixertrack.c:84 sys/oss/gstossmixer.c:100
msgid "Bass"
msgstr "Bass"
#: ext/alsa/gstalsamixertrack.c:85 sys/oss/gstossmixer.c:102
msgid "Treble"
msgstr "Diskant"
#: ext/alsa/gstalsamixertrack.c:86 sys/oss/gstossmixer.c:106
msgid "PCM"
msgstr "PCM"
#: ext/alsa/gstalsamixertrack.c:87 sys/oss/gstossmixer.c:104
msgid "Synth"
msgstr "Synth"
#: ext/alsa/gstalsamixertrack.c:88 sys/oss/gstossmixer.c:110
msgid "Line-in"
msgstr "Linje inn"
#: ext/alsa/gstalsamixertrack.c:89 sys/oss/gstossmixer.c:114
msgid "CD"
msgstr "CD"
#: ext/alsa/gstalsamixertrack.c:90 sys/oss/gstossmixer.c:112
msgid "Microphone"
msgstr "Mikrofon"
#: ext/alsa/gstalsamixertrack.c:91
#, fuzzy
msgid "PC Speaker"
msgstr "Høyttaler"
#: ext/alsa/gstalsamixertrack.c:92
msgid "Playback"
msgstr ""
#: ext/alsa/gstalsamixertrack.c:93
msgid "Capture"
msgstr ""
#: ext/audiofile/gstafsink.c:344 ext/sndfile/gstsf.c:624
#: ext/audiofile/gstafsink.c:342 ext/sndfile/gstsf.c:624
#, c-format
msgid "Could not open file \"%s\" for writing."
msgstr "Kunne ikke åpne filen «%s» for skriving."
#: ext/audiofile/gstafsink.c:366 ext/audiofile/gstafsrc.c:371
#: ext/audiofile/gstafsink.c:364 ext/audiofile/gstafsrc.c:369
#, c-format
msgid "Error closing file \"%s\"."
msgstr "Feil under lukking av fil «%s»."
#: ext/audiofile/gstafsrc.c:318
#: ext/audiofile/gstafsrc.c:316
#, c-format
msgid "Could not open file \"%s\" for reading."
msgstr "Kunne ikke åpne filen «%s» for lesing."
#: ext/cdparanoia/gstcdparanoia.c:278
msgid "discid"
msgstr ""
#: ext/cdparanoia/gstcdparanoia.c:278
msgid "CDDA discid for metadata retrieval"
msgstr ""
#: ext/cdparanoia/gstcdparanoia.c:683 ext/cdparanoia/gstcdparanoia.c:699
msgid "Could not open CD device for reading."
msgstr "Kunne ikke åpne CD-enheten for lesing."
#: ext/gnomevfs/gstgnomevfssrc.c:1157
#, c-format
msgid "Could not open vfs file \"%s\" for reading."
msgstr "Kunne ikke åpne VFS-fil «%s» for lesing."
#: ext/gnomevfs/gstgnomevfssrc.c:1165
msgid "No filename given."
msgstr "Ingen filnavn oppgitt."
#: ext/gnomevfs/gstgnomevfssink.c:432
#, c-format
msgid "Could not open vfs file \"%s\" for writing: %s."
msgstr "Kunne ikke åpne VFS-fil «%s» for skriving: %s."
#: ext/gnomevfs/gstgnomevfssink.c:439
msgid "No filename given"
msgstr "Ingen filnavn oppgitt"
#: ext/gnomevfs/gstgnomevfssink.c:467
#, c-format
msgid "Could not close vfs file \"%s\"."
msgstr "Kunne ikke lukke VFS-fil «%s»."
#: ext/sndfile/gstsf.c:585
msgid "No filename specified."
msgstr "Ingen filnavn oppgitt."
......@@ -122,188 +42,213 @@ msgstr "Kunne ikke skrive til fil «%s»."
msgid "No or invalid input audio, AVI stream will be corrupt."
msgstr ""
#: gst-libs/gst/play/play.c:719
msgid "Failed to create playbin object"
msgstr ""
#: sys/dxr3/dxr3audiosink.c:298
#: sys/dxr3/dxr3audiosink.c:296
#, c-format
msgid "Could not open audio device \"%s\" for writing."
msgstr ""
#: sys/dxr3/dxr3audiosink.c:310 sys/dxr3/dxr3videosink.c:283
#: sys/dxr3/dxr3audiosink.c:308 sys/dxr3/dxr3videosink.c:281
#, c-format
msgid "Could not open control device \"%s\" for writing."
msgstr ""
#: sys/dxr3/dxr3audiosink.c:343
#: sys/dxr3/dxr3audiosink.c:341
#, c-format
msgid "Could not configure audio device \"%s\"."
msgstr "Kunne ikke konfigurere lydenhet «%s»."
#: sys/dxr3/dxr3audiosink.c:357 sys/dxr3/dxr3audiosink.c:394
#: sys/dxr3/dxr3audiosink.c:355 sys/dxr3/dxr3audiosink.c:392
#, c-format
msgid "Could not set audio device \"%s\" to %d Hz."
msgstr ""
#: sys/dxr3/dxr3audiosink.c:422
#: sys/dxr3/dxr3audiosink.c:420
#, c-format
msgid "Could not close audio device \"%s\"."
msgstr ""
#: sys/dxr3/dxr3audiosink.c:429 sys/dxr3/dxr3videosink.c:308
#: sys/dxr3/dxr3audiosink.c:427 sys/dxr3/dxr3videosink.c:306
#, c-format
msgid "Could not close control device \"%s\"."
msgstr ""
#: sys/dxr3/dxr3videosink.c:271
#: sys/dxr3/dxr3videosink.c:269
#, c-format
msgid "Could not open video device \"%s\" for writing."
msgstr ""
#: sys/dxr3/dxr3videosink.c:301
#: sys/dxr3/dxr3videosink.c:299
#, c-format
msgid "Could not close video device \"%s\"."
msgstr ""
#: sys/dxr3/dxr3videosink.c:453 sys/v4l2/v4l2src_calls.c:124
#: sys/dxr3/dxr3videosink.c:451
#, c-format
msgid "Could not write to device \"%s\"."
msgstr ""
#: sys/oss/gstosselement.c:726
#: sys/oss/gstosselement.c:702
#, c-format
msgid "OSS device \"%s\" is already in use by another program."
msgstr ""
#: sys/oss/gstosselement.c:733 sys/oss/gstosselement.c:737
#: sys/oss/gstosselement.c:709 sys/oss/gstosselement.c:713
#, c-format
msgid "Could not access device \"%s\", check its permissions."
msgstr ""
#: sys/oss/gstosselement.c:744 sys/v4l/v4l_calls.c:168
#: sys/oss/gstosselement.c:720
#, c-format
msgid "Device \"%s\" does not exist."
msgstr "Enhet «%s» eksisterer ikke."
#: sys/oss/gstosselement.c:751
#: sys/oss/gstosselement.c:726
#, c-format
msgid "Could not open device \"%s\" for writing."
msgstr ""
#: sys/oss/gstosselement.c:755
#: sys/oss/gstosselement.c:730
#, c-format
msgid "Could not open device \"%s\" for reading."
msgstr ""
#: sys/oss/gstosselement.c:1153
msgid "Your OSS device doesn't support mono or stereo."
msgstr ""
#: sys/oss/gstosselement.c:1167
#: sys/oss/gstosselement.c:1079
msgid "Your OSS device could not be probed correctly"
msgstr ""
#: sys/oss/gstossmixer.c:98
#: sys/oss/gstossmixer.c:84
msgid "Volume"
msgstr "Volum"
#: sys/oss/gstossmixer.c:108
#: sys/oss/gstossmixer.c:86
msgid "Bass"
msgstr "Bass"
#: sys/oss/gstossmixer.c:88
msgid "Treble"
msgstr "Diskant"
#: sys/oss/gstossmixer.c:90
msgid "Synth"
msgstr "Synth"
#: sys/oss/gstossmixer.c:92
msgid "PCM"
msgstr "PCM"
#: sys/oss/gstossmixer.c:94
msgid "Speaker"
msgstr "Høyttaler"
#: sys/oss/gstossmixer.c:116
#: sys/oss/gstossmixer.c:96
msgid "Line-in"
msgstr "Linje inn"
#: sys/oss/gstossmixer.c:98
msgid "Microphone"
msgstr "Mikrofon"
#: sys/oss/gstossmixer.c:100
msgid "CD"
msgstr "CD"
#: sys/oss/gstossmixer.c:102
msgid "Mixer"
msgstr "Mikser"
#: sys/oss/gstossmixer.c:118
#: sys/oss/gstossmixer.c:104
msgid "PCM-2"
msgstr "PCM-2"
#: sys/oss/gstossmixer.c:120
#: sys/oss/gstossmixer.c:106
msgid "Record"
msgstr "Opptak"
#: sys/oss/gstossmixer.c:122
#: sys/oss/gstossmixer.c:108
msgid "In-gain"
msgstr ""
#: sys/oss/gstossmixer.c:124
#: sys/oss/gstossmixer.c:110
msgid "Out-gain"
msgstr ""
#: sys/oss/gstossmixer.c:126
#: sys/oss/gstossmixer.c:112
msgid "Line-1"
msgstr "Linje 1"
#: sys/oss/gstossmixer.c:128
#: sys/oss/gstossmixer.c:114
msgid "Line-2"
msgstr "Linje 2"
#: sys/oss/gstossmixer.c:130
#: sys/oss/gstossmixer.c:116
msgid "Line-3"
msgstr "Linje 3"
#: sys/oss/gstossmixer.c:132
#: sys/oss/gstossmixer.c:118
msgid "Digital-1"
msgstr "Digital 1"
#: sys/oss/gstossmixer.c:134
#: sys/oss/gstossmixer.c:120
msgid "Digital-2"
msgstr "Digital 2"
#: sys/oss/gstossmixer.c:136
#: sys/oss/gstossmixer.c:122
msgid "Digital-3"
msgstr "Digital 3"
#: sys/oss/gstossmixer.c:138
#: sys/oss/gstossmixer.c:124
msgid "Phone-in"
msgstr "Telefon inn"
#: sys/oss/gstossmixer.c:140
#: sys/oss/gstossmixer.c:126
msgid "Phone-out"
msgstr "Telefon ut"
#: sys/oss/gstossmixer.c:142
#: sys/oss/gstossmixer.c:128
msgid "Video"
msgstr "Video"
#: sys/oss/gstossmixer.c:144
#: sys/oss/gstossmixer.c:130
msgid "Radio"
msgstr "Radio"
#: sys/oss/gstossmixer.c:146
#: sys/oss/gstossmixer.c:132
msgid "Monitor"
msgstr "Monitor"
#: sys/v4l/v4l_calls.c:159
msgid "No device specified."
msgstr "Ingen enhet oppgitt."
#, fuzzy
#~ msgid "PC Speaker"
#~ msgstr "Høyttaler"
#: sys/v4l/v4l_calls.c:172 sys/v4l2/v4l2_calls.c:400
#, c-format
msgid "Could not open device \"%s\" for reading and writing."
msgstr "Kunne ikke åpne enhet «%s» for lesing og skriving."
#~ msgid "Could not open CD device for reading."
#~ msgstr "Kunne ikke åpne CD-enheten for lesing."
#: sys/v4l/v4l_calls.h:50
msgid "Device is not open."
msgstr "Enheten er ikke åpen."
#~ msgid "Could not open vfs file \"%s\" for reading."
#~ msgstr "Kunne ikke åpne VFS-fil «%s» for lesing."
#: sys/v4l/v4l_calls.h:59
msgid "Device is open."
msgstr "Enheten er åpen."
#~ msgid "No filename given."
#~ msgstr "Ingen filnavn oppgitt."
#: sys/v4l2/v4l2_calls.c:414
#, c-format
msgid "Device \"%s\" is not a capture device."
msgstr "Enhet «%s» kan ikke fange data."
#~ msgid "Could not open vfs file \"%s\" for writing: %s."
#~ msgstr "Kunne ikke åpne VFS-fil «%s» for skriving: %s."
#: sys/v4l2/v4l2src_calls.c:256
#, c-format
msgid "Could not get buffers from device \"%s\"."
msgstr ""
#~ msgid "No filename given"
#~ msgstr "Ingen filnavn oppgitt"
#: sys/v4l2/v4l2src_calls.c:265
#, c-format
msgid "Could not get enough buffers from device \"%s\"."
msgstr ""
#~ msgid "Could not close vfs file \"%s\"."
#~ msgstr "Kunne ikke lukke VFS-fil «%s»."
#~ msgid "No device specified."
#~ msgstr "Ingen enhet oppgitt."
#~ msgid "Could not open device \"%s\" for reading and writing."
#~ msgstr "Kunne ikke åpne enhet «%s» for lesing og skriving."
#~ msgid "Device is not open."
#~ msgstr "Enheten er ikke åpen."
#~ msgid "Device is open."
#~ msgstr "Enheten er åpen."
#~ msgid "Device \"%s\" is not a capture device."
#~ msgstr "Enhet «%s» kan ikke fange data."
po/nl.po
View file @ da8915bf
This diff is collapsed.
po/or.po
View file @ da8915bf
This diff is collapsed.
po/sq.po
View file @ da8915bf
This diff is collapsed.
po/sr.po
View file @ da8915bf
This diff is collapsed.
po/sv.po
View file @ da8915bf
This diff is collapsed.
po/uk.po
View file @ da8915bf
This diff is collapsed.
po/vi.po
View file @ da8915bf
This diff is collapsed.
sys/oss/gstosselement.c
View file @ da8915bf
......@@ -69,7 +69,7 @@ static void gst_osselement_get_property (GObject * object,
static GstElementClass *parent_class = NULL;
/*static guint gst_osssrc_signals[LAST_SIGNAL] = { 0 }; */
/*static guint gst_oss_src_signals[LAST_SIGNAL] = { 0 }; */
GType
gst_osselement_get_type (void)
......
sys/oss/gstosssink.c
View file @ da8915bf
......@@ -34,27 +34,27 @@
#include "gstosssink.h"
/* elementfactory information */
static GstElementDetails gst_osssink_details =
static GstElementDetails gst_oss_sink_details =
GST_ELEMENT_DETAILS ("Audio Sink (OSS)",
"Sink/Audio",
"Output to a sound card via OSS",
"Erik Walthinsen <omega@cse.ogi.edu>, "
"Wim Taymans <wim.taymans@chello.be>");
static void gst_osssink_base_init (gpointer g_class);
static void gst_osssink_class_init (GstOssSinkClass * klass);
static void gst_osssink_init (GstOssSink * osssink);
static void gst_osssink_dispose (GObject * object);
static void gst_oss_sink_base_init (gpointer g_class);
static void gst_oss_sink_class_init (GstOssSinkClass * klass);
static void gst_oss_sink_init (GstOssSink * osssink);
static void gst_oss_sink_dispose (GObject * object);
static GstCaps *gst_osssink_getcaps (GstBaseSink * bsink);
static GstCaps *gst_oss_sink_getcaps (GstBaseSink * bsink);
static gboolean gst_osssink_open (GstAudioSink * asink,
static gboolean gst_oss_sink_open (GstAudioSink * asink,
GstRingBufferSpec * spec);
static gboolean gst_osssink_close (GstAudioSink * asink);
static guint gst_osssink_write (GstAudioSink * asink, gpointer data,
static gboolean gst_oss_sink_close (GstAudioSink * asink);
static guint gst_oss_sink_write (GstAudioSink * asink, gpointer data,
guint length);
static guint gst_osssink_delay (GstAudioSink * asink);
static void gst_osssink_reset (GstAudioSink * asink);
static guint gst_oss_sink_delay (GstAudioSink * asink);
static void gst_oss_sink_reset (GstAudioSink * asink);
/* OssSink signals and args */
enum
......@@ -83,28 +83,28 @@ static GstStaticPadTemplate osssink_sink_factory =
static GstElementClass *parent_class = NULL;
/* static guint gst_osssink_signals[LAST_SIGNAL] = { 0 }; */
/* static guint gst_oss_sink_signals[LAST_SIGNAL] = { 0 }; */
GType
gst_osssink_get_type (void)
gst_oss_sink_get_type (void)
{
static GType osssink_type = 0;
if (!osssink_type) {
static const GTypeInfo osssink_info = {
sizeof (GstOssSinkClass),
gst_osssink_base_init,
gst_oss_sink_base_init,
NULL,
(GClassInitFunc) gst_osssink_class_init,
(GClassInitFunc) gst_oss_sink_class_init,
NULL,
NULL,
sizeof (GstOssSink),
0,
(GInstanceInitFunc) gst_osssink_init,
(GInstanceInitFunc) gst_oss_sink_init,
};
osssink_type =
g_type_register_static (GST_TYPE_AUDIOSINK, "GstOssSink",
g_type_register_static (GST_TYPE_AUDIO_SINK, "GstOssSink",
&osssink_info, 0);
}
......@@ -112,23 +112,23 @@ gst_osssink_get_type (void)
}
static void
gst_osssink_dispose (GObject * object)
gst_oss_sink_dispose (GObject * object)
{
G_OBJECT_CLASS (parent_class)->dispose (object);
}
static void
gst_osssink_base_init (gpointer g_class)
gst_oss_sink_base_init (gpointer g_class)
{
GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
gst_element_class_set_details (element_class, &gst_osssink_details);
gst_element_class_set_details (element_class, &gst_oss_sink_details);
gst_element_class_add_pad_template (element_class,
gst_static_pad_template_get (&osssink_sink_factory));
}
static void
gst_osssink_class_init (GstOssSinkClass * klass)
gst_oss_sink_class_init (GstOssSinkClass * klass)
{
GObjectClass *gobject_class;
GstElementClass *gstelement_class;
......@@ -142,21 +142,21 @@ gst_osssink_class_init (GstOssSinkClass * klass)
gstbaseaudiosink_class = (GstBaseAudioSinkClass *) klass;
gstaudiosink_class = (GstAudioSinkClass *) klass;
parent_class = g_type_class_ref (GST_TYPE_BASEAUDIOSINK);
parent_class = g_type_class_ref (GST_TYPE_BASE_AUDIO_SINK);
gobject_class->dispose = gst_osssink_dispose;
gobject_class->dispose = gst_oss_sink_dispose;
gstbasesink_class->get_caps = GST_DEBUG_FUNCPTR (gst_osssink_getcaps);
gstbasesink_class->get_caps = GST_DEBUG_FUNCPTR (gst_oss_sink_getcaps);