mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-24 09:10:36 +00:00
Ok a new batch of // to /* */ fixes commited
Original commit message from CVS: Ok a new batch of // to /* */ fixes commited
This commit is contained in:
parent
9d84e5353b
commit
fb03befba9
7 changed files with 29 additions and 29 deletions
|
@ -19,7 +19,7 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//#define DEBUG_ENABLED
|
/*#define DEBUG_ENABLED */
|
||||||
|
|
||||||
|
|
||||||
#include <wine/winbase.h>
|
#include <wine/winbase.h>
|
||||||
|
@ -172,7 +172,7 @@ static GstPad *gst_avi_decoder_get_audio_srcpad_winloader(GstAviDecoder *avi_dec
|
||||||
gst_pad_connect(newpad, sinkpad);
|
gst_pad_connect(newpad, sinkpad);
|
||||||
gst_pad_set_chain_function (newpad, GST_RPAD_CHAINFUNC (sinkpad));
|
gst_pad_set_chain_function (newpad, GST_RPAD_CHAINFUNC (sinkpad));
|
||||||
|
|
||||||
//gst_pad_connect(newpad, sinkpad);
|
/*gst_pad_connect(newpad, sinkpad); */
|
||||||
avi_decoder->audio_pad[pad_nr] = newpad;
|
avi_decoder->audio_pad[pad_nr] = newpad;
|
||||||
|
|
||||||
data->out = sinkpad;
|
data->out = sinkpad;
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
//#define GST_DEBUG_ENABLED
|
/*#define GST_DEBUG_ENABLED */
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include "gstaviaudiodecoder.h"
|
#include "gstaviaudiodecoder.h"
|
||||||
|
@ -86,7 +86,7 @@ static void gst_avi_audio_decoder_get_property (GObject *object, guint
|
||||||
|
|
||||||
|
|
||||||
static GstElementClass *parent_class = NULL;
|
static GstElementClass *parent_class = NULL;
|
||||||
//static guint gst_avi_audio_decoder_signals[LAST_SIGNAL] = { 0 };
|
/*static guint gst_avi_audio_decoder_signals[LAST_SIGNAL] = { 0 }; */
|
||||||
|
|
||||||
GType
|
GType
|
||||||
gst_avi_audio_decoder_get_type(void)
|
gst_avi_audio_decoder_get_type(void)
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
//#define GST_DEBUG_ENABLED
|
/*#define GST_DEBUG_ENABLED */
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include "gstavidecoder.h"
|
#include "gstavidecoder.h"
|
||||||
|
@ -123,7 +123,7 @@ static void gst_avi_decoder_get_property (GObject *object, guint prop_id,
|
||||||
|
|
||||||
|
|
||||||
static GstElementClass *parent_class = NULL;
|
static GstElementClass *parent_class = NULL;
|
||||||
//static guint gst_avi_decoder_signals[LAST_SIGNAL] = { 0 };
|
/*static guint gst_avi_decoder_signals[LAST_SIGNAL] = { 0 }; */
|
||||||
|
|
||||||
GType
|
GType
|
||||||
gst_avi_decoder_get_type(void)
|
gst_avi_decoder_get_type(void)
|
||||||
|
@ -158,13 +158,13 @@ gst_avi_decoder_class_init (GstAviDecoderClass *klass)
|
||||||
|
|
||||||
g_object_class_install_property (G_OBJECT_CLASS(klass), ARG_BITRATE,
|
g_object_class_install_property (G_OBJECT_CLASS(klass), ARG_BITRATE,
|
||||||
g_param_spec_long ("bitrate","bitrate","bitrate",
|
g_param_spec_long ("bitrate","bitrate","bitrate",
|
||||||
G_MINLONG, G_MAXLONG, 0, G_PARAM_READABLE)); // CHECKME
|
G_MINLONG, G_MAXLONG, 0, G_PARAM_READABLE)); /* CHECKME */
|
||||||
g_object_class_install_property (G_OBJECT_CLASS(klass), ARG_MEDIA_TIME,
|
g_object_class_install_property (G_OBJECT_CLASS(klass), ARG_MEDIA_TIME,
|
||||||
g_param_spec_long ("media_time","media_time","media_time",
|
g_param_spec_long ("media_time","media_time","media_time",
|
||||||
G_MINLONG, G_MAXLONG, 0, G_PARAM_READABLE)); // CHECKME
|
G_MINLONG, G_MAXLONG, 0, G_PARAM_READABLE)); /* CHECKME */
|
||||||
g_object_class_install_property (G_OBJECT_CLASS(klass), ARG_CURRENT_TIME,
|
g_object_class_install_property (G_OBJECT_CLASS(klass), ARG_CURRENT_TIME,
|
||||||
g_param_spec_long ("current_time","current_time","current_time",
|
g_param_spec_long ("current_time","current_time","current_time",
|
||||||
G_MINLONG, G_MAXLONG, 0, G_PARAM_READABLE)); // CHECKME
|
G_MINLONG, G_MAXLONG, 0, G_PARAM_READABLE)); /* CHECKME */
|
||||||
|
|
||||||
parent_class = g_type_class_ref (GST_TYPE_BIN);
|
parent_class = g_type_class_ref (GST_TYPE_BIN);
|
||||||
|
|
||||||
|
@ -241,14 +241,14 @@ gst_avi_decoder_new_pad (GstElement *element, GstPad *pad, GstAviDecoder *avi_de
|
||||||
|
|
||||||
padname = "src_00";
|
padname = "src_00";
|
||||||
}
|
}
|
||||||
#endif // GST_DISABLE_AUTOPLUG
|
#endif /* GST_DISABLE_AUTOPLUG */
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!new_element && (media_type == AVI_TYPE_VIDEO)) {
|
if (!new_element && (media_type == AVI_TYPE_VIDEO)) {
|
||||||
padname = "src";
|
padname = "src";
|
||||||
}
|
}
|
||||||
else if (!new_element && (media_type == AVI_TYPE_AUDIO)) {
|
else if (!new_element && (media_type == AVI_TYPE_AUDIO)) {
|
||||||
//FIXME
|
/*FIXME */
|
||||||
padname = "src";
|
padname = "src";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/* Gnome-Streamer
|
/* GStreamer
|
||||||
* Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
|
* Copyright (C) <1999> Erik Walthinsen <omega@temple-baptist.com>
|
||||||
*
|
*
|
||||||
* This library is free software; you can redistribute it and/or
|
* This library is free software; you can redistribute it and/or
|
||||||
* modify it under the terms of the GNU Library General Public
|
* modify it under the terms of the GNU Library General Public
|
||||||
|
@ -18,7 +18,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
//#define GST_DEBUG_ENABLED
|
/* #define GST_DEBUG_ENABLED */
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include "gstavidemux.h"
|
#include "gstavidemux.h"
|
||||||
|
@ -108,7 +108,7 @@ static void gst_avi_demux_get_property (GObject *object, guint prop_id,
|
||||||
|
|
||||||
|
|
||||||
static GstElementClass *parent_class = NULL;
|
static GstElementClass *parent_class = NULL;
|
||||||
//static guint gst_avi_demux_signals[LAST_SIGNAL] = { 0 };
|
/*static guint gst_avi_demux_signals[LAST_SIGNAL] = { 0 }; */
|
||||||
|
|
||||||
GType
|
GType
|
||||||
gst_avi_demux_get_type(void)
|
gst_avi_demux_get_type(void)
|
||||||
|
@ -143,13 +143,13 @@ gst_avi_demux_class_init (GstAviDemuxClass *klass)
|
||||||
|
|
||||||
g_object_class_install_property (G_OBJECT_CLASS(klass), ARG_BITRATE,
|
g_object_class_install_property (G_OBJECT_CLASS(klass), ARG_BITRATE,
|
||||||
g_param_spec_long ("bitrate","bitrate","bitrate",
|
g_param_spec_long ("bitrate","bitrate","bitrate",
|
||||||
G_MINLONG, G_MAXLONG, 0, G_PARAM_READABLE)); // CHECKME
|
G_MINLONG, G_MAXLONG, 0, G_PARAM_READABLE)); /* CHECKME */
|
||||||
g_object_class_install_property (G_OBJECT_CLASS(klass), ARG_MEDIA_TIME,
|
g_object_class_install_property (G_OBJECT_CLASS(klass), ARG_MEDIA_TIME,
|
||||||
g_param_spec_long ("media_time","media_time","media_time",
|
g_param_spec_long ("media_time","media_time","media_time",
|
||||||
G_MINLONG, G_MAXLONG, 0, G_PARAM_READABLE)); // CHECKME
|
G_MINLONG, G_MAXLONG, 0, G_PARAM_READABLE)); /* CHECKME */
|
||||||
g_object_class_install_property (G_OBJECT_CLASS(klass), ARG_CURRENT_TIME,
|
g_object_class_install_property (G_OBJECT_CLASS(klass), ARG_CURRENT_TIME,
|
||||||
g_param_spec_long ("current_time","current_time","current_time",
|
g_param_spec_long ("current_time","current_time","current_time",
|
||||||
G_MINLONG, G_MAXLONG, 0, G_PARAM_READABLE)); // CHECKME
|
G_MINLONG, G_MAXLONG, 0, G_PARAM_READABLE)); /* CHECKME */
|
||||||
|
|
||||||
parent_class = g_type_class_ref (GST_TYPE_ELEMENT);
|
parent_class = g_type_class_ref (GST_TYPE_ELEMENT);
|
||||||
|
|
||||||
|
@ -180,7 +180,7 @@ gst_avi_demux_init (GstAviDemux *avi_demux)
|
||||||
avi_demux->index_size = 0;
|
avi_demux->index_size = 0;
|
||||||
avi_demux->resync_offset = 0;
|
avi_demux->resync_offset = 0;
|
||||||
|
|
||||||
//GST_FLAG_SET( GST_OBJECT (avi_demux), GST_ELEMENT_NO_SEEK);
|
/*GST_FLAG_SET( GST_OBJECT (avi_demux), GST_ELEMENT_NO_SEEK); */
|
||||||
|
|
||||||
for(i=0; i<GST_AVI_DEMUX_MAX_AUDIO_PADS; i++)
|
for(i=0; i<GST_AVI_DEMUX_MAX_AUDIO_PADS; i++)
|
||||||
avi_demux->audio_pad[i] = NULL;
|
avi_demux->audio_pad[i] = NULL;
|
||||||
|
@ -540,7 +540,7 @@ gst_avidemux_process_chunk (GstAviDemux *avi_demux, guint64 *filepos,
|
||||||
guint32 datashowed;
|
guint32 datashowed;
|
||||||
guint32 subchunksize = 0; /* size of a read subchunk */
|
guint32 subchunksize = 0; /* size of a read subchunk */
|
||||||
|
|
||||||
// flush the form type
|
/* flush the form type */
|
||||||
if (!gst_bytestream_flush (bs, sizeof (guint32)))
|
if (!gst_bytestream_flush (bs, sizeof (guint32)))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
|
|
|
@ -94,7 +94,7 @@ static void gst_avimux_get_property (GObject *object, guint prop_id,
|
||||||
|
|
||||||
|
|
||||||
static GstElementClass *parent_class = NULL;
|
static GstElementClass *parent_class = NULL;
|
||||||
//static guint gst_avimux_signals[LAST_SIGNAL] = { 0 };
|
/*static guint gst_avimux_signals[LAST_SIGNAL] = { 0 }; */
|
||||||
|
|
||||||
GType
|
GType
|
||||||
gst_avimux_get_type (void)
|
gst_avimux_get_type (void)
|
||||||
|
@ -309,7 +309,7 @@ gst_avimux_chain (GstPad *pad, GstBuffer *buf)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
//gst_buffer_unref(buf);
|
/*gst_buffer_unref(buf); */
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
//#define GST_DEBUG_ENABLED
|
/*#define GST_DEBUG_ENABLED */
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include "gstavitypes.h"
|
#include "gstavitypes.h"
|
||||||
|
@ -128,7 +128,7 @@ static void gst_avi_types_get_property (GObject *object, guint prop_id,
|
||||||
|
|
||||||
|
|
||||||
static GstElementClass *parent_class = NULL;
|
static GstElementClass *parent_class = NULL;
|
||||||
//static guint gst_avi_types_signals[LAST_SIGNAL] = { 0 };
|
/*static guint gst_avi_types_signals[LAST_SIGNAL] = { 0 }; */
|
||||||
|
|
||||||
GType
|
GType
|
||||||
gst_avi_types_get_type(void)
|
gst_avi_types_get_type(void)
|
||||||
|
@ -311,7 +311,7 @@ plugin_init (GModule *module, GstPlugin *plugin)
|
||||||
&gst_avi_types_details);
|
&gst_avi_types_details);
|
||||||
g_return_val_if_fail (factory != NULL, FALSE);
|
g_return_val_if_fail (factory != NULL, FALSE);
|
||||||
|
|
||||||
//gst_elementfactory_add_padtemplate (factory, GST_PADTEMPLATE_GET (src_templ));
|
/*gst_elementfactory_add_padtemplate (factory, GST_PADTEMPLATE_GET (src_templ)); */
|
||||||
gst_elementfactory_add_padtemplate (factory, GST_PADTEMPLATE_GET (sink_templ));
|
gst_elementfactory_add_padtemplate (factory, GST_PADTEMPLATE_GET (sink_templ));
|
||||||
|
|
||||||
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));
|
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));
|
||||||
|
|
|
@ -103,7 +103,7 @@ static GstElementStateReturn
|
||||||
|
|
||||||
|
|
||||||
static GstElementClass *parent_class = NULL;
|
static GstElementClass *parent_class = NULL;
|
||||||
//static guint gst_cdxa_parse_signals[LAST_SIGNAL] = { 0 };
|
/*static guint gst_cdxa_parse_signals[LAST_SIGNAL] = { 0 }; */
|
||||||
|
|
||||||
GType
|
GType
|
||||||
gst_cdxa_parse_get_type(void)
|
gst_cdxa_parse_get_type(void)
|
||||||
|
@ -138,13 +138,13 @@ gst_cdxa_parse_class_init (GstCDXAParseClass *klass)
|
||||||
|
|
||||||
g_object_class_install_property (G_OBJECT_CLASS(klass), ARG_BITRATE,
|
g_object_class_install_property (G_OBJECT_CLASS(klass), ARG_BITRATE,
|
||||||
g_param_spec_long ("bitrate","bitrate","bitrate",
|
g_param_spec_long ("bitrate","bitrate","bitrate",
|
||||||
G_MINLONG, G_MAXLONG, 0, G_PARAM_READABLE)); // CHECKME
|
G_MINLONG, G_MAXLONG, 0, G_PARAM_READABLE)); /* CHECKME */
|
||||||
g_object_class_install_property (G_OBJECT_CLASS(klass), ARG_MEDIA_TIME,
|
g_object_class_install_property (G_OBJECT_CLASS(klass), ARG_MEDIA_TIME,
|
||||||
g_param_spec_long ("media_time","media_time","media_time",
|
g_param_spec_long ("media_time","media_time","media_time",
|
||||||
G_MINLONG, G_MAXLONG, 0, G_PARAM_READABLE)); // CHECKME
|
G_MINLONG, G_MAXLONG, 0, G_PARAM_READABLE)); /* CHECKME */
|
||||||
g_object_class_install_property (G_OBJECT_CLASS(klass), ARG_CURRENT_TIME,
|
g_object_class_install_property (G_OBJECT_CLASS(klass), ARG_CURRENT_TIME,
|
||||||
g_param_spec_long ("current_time","current_time","current_time",
|
g_param_spec_long ("current_time","current_time","current_time",
|
||||||
G_MINLONG, G_MAXLONG, 0, G_PARAM_READABLE)); // CHECKME
|
G_MINLONG, G_MAXLONG, 0, G_PARAM_READABLE)); /* CHECKME */
|
||||||
|
|
||||||
parent_class = g_type_class_ref (GST_TYPE_ELEMENT);
|
parent_class = g_type_class_ref (GST_TYPE_ELEMENT);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue