gnomemm r2006 - in gstreamermm/trunk: . gstreamer/src tools/m4
- From: jaalburqu svn gnome org
- To: svn-commits-list gnome org
- Subject: gnomemm r2006 - in gstreamermm/trunk: . gstreamer/src tools/m4
- Date: Thu, 22 Jan 2009 01:25:37 +0000 (UTC)
Author: jaalburqu
Date: Thu Jan 22 01:25:37 2009
New Revision: 2006
URL: http://svn.gnome.org/viewvc/gnomemm?rev=2006&view=rev
Log:
2009-01-21 Josà Alburquerque <jaalburqu svn gnome org>
const corrections in [p-z]*.{hg,ccg} source files:
* gstreamer/src/query.ccg:
* gstreamer/src/query.hg:
* gstreamer/src/registry.ccg:
* gstreamer/src/registry.hg:
* gstreamer/src/segment.hg:
* gstreamer/src/taglist.ccg:
* gstreamer/src/taglist.hg:
* gstreamer/src/tagsetter.hg: Wrapped reset_tags(). Corrected
get_tag_merge_mode() method name.
* gstreamer/src/task.ccg:
* gstreamer/src/task.hg:
* gstreamer/src/urihandler.hg: Added TODO.
* gstreamer/src/value.ccg:
* gstreamer/src/value.hg: Renamed Fourcc::get_ccs() to
Fourcc::set_ccs() because it is in fact a "setting" method. Removed
unneeded explicit in Fraction constructor.
* gstreamer/src/xml.ccg: Re-ordered method definitions according to
the order in the .hg file.
* gstreamer/src/xml.hg: Added TODO.
* gstreamer/src/xoverlay.hg: Added TODO.
* tools/m4/convert_gst.m4: Const correction of Gst::TagList
conversion.
Modified:
gstreamermm/trunk/ChangeLog
gstreamermm/trunk/gstreamer/src/query.ccg
gstreamermm/trunk/gstreamer/src/query.hg
gstreamermm/trunk/gstreamer/src/registry.ccg
gstreamermm/trunk/gstreamer/src/registry.hg
gstreamermm/trunk/gstreamer/src/segment.hg
gstreamermm/trunk/gstreamer/src/taglist.ccg
gstreamermm/trunk/gstreamer/src/taglist.hg
gstreamermm/trunk/gstreamer/src/tagsetter.hg
gstreamermm/trunk/gstreamer/src/task.ccg
gstreamermm/trunk/gstreamer/src/task.hg
gstreamermm/trunk/gstreamer/src/urihandler.hg
gstreamermm/trunk/gstreamer/src/value.ccg
gstreamermm/trunk/gstreamer/src/value.hg
gstreamermm/trunk/gstreamer/src/xml.ccg
gstreamermm/trunk/gstreamer/src/xml.hg
gstreamermm/trunk/gstreamer/src/xoverlay.hg
gstreamermm/trunk/tools/m4/convert_gst.m4
Modified: gstreamermm/trunk/gstreamer/src/query.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/query.ccg (original)
+++ gstreamermm/trunk/gstreamer/src/query.ccg Thu Jan 22 01:25:37 2009
@@ -112,41 +112,48 @@
gst_query_set_convert(gobj(), GstFormat(src_format), src_value, GstFormat(dest_format), dest_value);
}
-void QueryConvert::parse(Format& src_format, gint64& src_value, Format& dest_format, gint64& dest_value)
+void QueryConvert::parse(Format& src_format, gint64& src_value, Format& dest_format, gint64& dest_value) const
{
- gst_query_parse_convert(gobj(), (GstFormat*)(&src_format), &src_value, (GstFormat*)(&dest_format), &dest_value);
+ gst_query_parse_convert(const_cast<GstQuery*>(gobj()),
+ (GstFormat*)(&src_format), &src_value, (GstFormat*)(&dest_format),
+ &dest_value);
}
-void QueryConvert::parse(Format& dest_format, gint64& dest_value)
+void QueryConvert::parse(Format& dest_format, gint64& dest_value) const
{
- gst_query_parse_convert(gobj(), NULL, NULL, (GstFormat*)(&dest_format), &dest_value);
+ gst_query_parse_convert(const_cast<GstQuery*>(gobj()), NULL, NULL,
+ (GstFormat*)(&dest_format), &dest_value);
}
-Format QueryConvert::parse_src_format()
+Format QueryConvert::parse_src_format() const
{
Format src_format;
- gst_query_parse_convert(gobj(), (GstFormat*)(&src_format), NULL, NULL, NULL);
+ gst_query_parse_convert(const_cast<GstQuery*>(gobj()),
+ (GstFormat*)(&src_format), NULL, NULL, NULL);
return src_format;
}
-gint64 QueryConvert::parse_src_value()
+gint64 QueryConvert::parse_src_value() const
{
gint64 src_value;
- gst_query_parse_convert(gobj(), NULL, &src_value, NULL, NULL);
+ gst_query_parse_convert(const_cast<GstQuery*>(gobj()), NULL, &src_value,
+ NULL, NULL);
return src_value;
}
-Format QueryConvert::parse_dest_format()
+Format QueryConvert::parse_dest_format() const
{
Format dest_format;
- gst_query_parse_convert(gobj(), NULL, NULL, (GstFormat*)(&dest_format), NULL);
+ gst_query_parse_convert(const_cast<GstQuery*>(gobj()), NULL, NULL,
+ (GstFormat*)(&dest_format), NULL);
return dest_format;
}
-gint64 QueryConvert::parse_dest_value()
+gint64 QueryConvert::parse_dest_value() const
{
gint64 dest_value;
- gst_query_parse_convert(gobj(), NULL, NULL, NULL, &dest_value);
+ gst_query_parse_convert(const_cast<GstQuery*>(gobj()), NULL, NULL, NULL,
+ &dest_value);
return dest_value;
}
@@ -166,22 +173,24 @@
gst_query_set_position(gobj(), GstFormat(format), position);
}
-void QueryPosition::parse(Format& format, gint64& position)
+void QueryPosition::parse(Format& format, gint64& position) const
{
- gst_query_parse_position(gobj(), (GstFormat*)(&format), &position);
+ gst_query_parse_position(const_cast<GstQuery*>(gobj()),
+ (GstFormat*)(&format), &position);
}
-gint64 QueryPosition::parse()
+gint64 QueryPosition::parse() const
{
gint64 position;
- gst_query_parse_position(gobj(), NULL, &position);
+ gst_query_parse_position(const_cast<GstQuery*>(gobj()), NULL, &position);
return position;
}
-Format QueryPosition::parse_format()
+Format QueryPosition::parse_format() const
{
Format format;
- gst_query_parse_position(gobj(), (GstFormat*)(&format), NULL);
+ gst_query_parse_position(const_cast<GstQuery*>(gobj()),
+ (GstFormat*)(&format), NULL);
return format;
}
@@ -201,22 +210,24 @@
gst_query_set_duration(gobj(), GstFormat(format), duration);
}
-void QueryDuration::parse(Format& format, gint64& duration)
+void QueryDuration::parse(Format& format, gint64& duration) const
{
- gst_query_parse_duration(gobj(), (GstFormat*)(&format), &duration);
+ gst_query_parse_duration(const_cast<GstQuery*>(gobj()),
+ (GstFormat*)(&format), &duration);
}
-gint64 QueryDuration::parse()
+gint64 QueryDuration::parse() const
{
gint64 duration;
- gst_query_parse_duration(gobj(), NULL, &duration);
+ gst_query_parse_duration(const_cast<GstQuery*>(gobj()), NULL, &duration);
return duration;
}
-Format QueryDuration::parse_format()
+Format QueryDuration::parse_format() const
{
Format format;
- gst_query_parse_duration(gobj(), (GstFormat*)(&format), NULL);
+ gst_query_parse_duration(const_cast<GstQuery*>(gobj()),
+ (GstFormat*)(&format), NULL);
return format;
}
@@ -236,31 +247,34 @@
gst_query_set_latency(gobj(), live, GstClockTime(min_latency), GstClockTime(max_latency));
}
-void QueryLatency::parse(bool& live, ClockTime& min_latency, ClockTime& max_latency)
+void QueryLatency::parse(bool& live, ClockTime& min_latency, ClockTime& max_latency) const
{
gboolean glive;
- gst_query_parse_latency(gobj(), &glive, (ClockTime*)(&min_latency), (ClockTime*)(&max_latency));
+ gst_query_parse_latency(const_cast<GstQuery*>(gobj()), &glive,
+ (ClockTime*)(&min_latency), (ClockTime*)(&max_latency));
live = glive;
}
-bool QueryLatency::parse_live()
+bool QueryLatency::parse_live() const
{
gboolean glive;
- gst_query_parse_latency(gobj(), &glive, NULL, NULL);
+ gst_query_parse_latency(const_cast<GstQuery*>(gobj()), &glive, NULL, NULL);
return glive;
}
-ClockTime QueryLatency::parse_min()
+ClockTime QueryLatency::parse_min() const
{
ClockTime min;
- gst_query_parse_latency(gobj(), NULL, (ClockTime*)(&min), NULL);
+ gst_query_parse_latency(const_cast<GstQuery*>(gobj()), NULL,
+ (ClockTime*)(&min), NULL);
return min;
}
-ClockTime QueryLatency::parse_max()
+ClockTime QueryLatency::parse_max() const
{
ClockTime max;
- gst_query_parse_latency(gobj(), NULL, NULL, (ClockTime*)(&max));
+ gst_query_parse_latency(const_cast<GstQuery*>(gobj()), NULL, NULL,
+ (ClockTime*)(&max));
return max;
}
@@ -280,38 +294,43 @@
gst_query_set_seeking(gobj(), GstFormat(format), seekable, segment_start, segment_end);
}
-void QuerySeeking::parse(Format& format, bool& seekable, gint64& segment_start, gint64& segment_end)
+void QuerySeeking::parse(Format& format, bool& seekable, gint64& segment_start, gint64& segment_end) const
{
gboolean gseekable;
- gst_query_parse_seeking(gobj(), (GstFormat*)(&format), &gseekable, &segment_start, &segment_end);
+ gst_query_parse_seeking(const_cast<GstQuery*>(gobj()),
+ (GstFormat*)(&format), &gseekable, &segment_start, &segment_end);
seekable = gseekable;
}
-Format QuerySeeking::parse_format()
+Format QuerySeeking::parse_format() const
{
Format format;
- gst_query_parse_seeking(gobj(), (GstFormat*)(&format), NULL, NULL, NULL);
+ gst_query_parse_seeking(const_cast<GstQuery*>(gobj()),
+ (GstFormat*)(&format), NULL, NULL, NULL);
return format;
}
-bool QuerySeeking::parse_seekable()
+bool QuerySeeking::parse_seekable() const
{
gboolean gseekable;
- gst_query_parse_seeking(gobj(), NULL, &gseekable, NULL, NULL);
+ gst_query_parse_seeking(const_cast<GstQuery*>(gobj()), NULL,
+ &gseekable, NULL, NULL);
return gseekable;
}
-gint64 QuerySeeking::parse_start()
+gint64 QuerySeeking::parse_start() const
{
gint64 start;
- gst_query_parse_seeking(gobj(), NULL, NULL, &start, NULL);
+ gst_query_parse_seeking(const_cast<GstQuery*>(gobj()), NULL, NULL,
+ &start, NULL);
return start;
}
-gint64 QuerySeeking::parse_end()
+gint64 QuerySeeking::parse_end() const
{
gint64 end;
- gst_query_parse_seeking(gobj(), NULL, NULL,NULL, &end);
+ gst_query_parse_seeking(const_cast<GstQuery*>(gobj()), NULL, NULL,NULL,
+ &end);
return end;
}
@@ -336,17 +355,18 @@
gst_query_set_formatsv(gobj(), n_formats, (GstFormat*)(formats.data()));
}
-guint QueryFormats::parse_length()
+guint QueryFormats::parse_length() const
{
guint n_formats;
- gst_query_parse_formats_length(gobj(), &n_formats);
+ gst_query_parse_formats_length(const_cast<GstQuery*>(gobj()), &n_formats);
return n_formats;
}
-Format QueryFormats::parse(guint nth)
+Format QueryFormats::parse(guint nth) const
{
Format format;
- gst_query_parse_formats_nth(gobj(), nth, (GstFormat*)(&format));
+ gst_query_parse_formats_nth(const_cast<GstQuery*>(gobj()), nth,
+ (GstFormat*)(&format));
return format;
}
@@ -366,36 +386,41 @@
gst_query_set_segment(gobj(), rate, GstFormat(format), start_value, stop_value);
}
-void QuerySegment::parse(double& rate, Format& format, gint64& start_value, gint64& stop_value)
+void QuerySegment::parse(double& rate, Format& format, gint64& start_value, gint64& stop_value) const
{
- gst_query_parse_segment(gobj(), &rate, (GstFormat*)(&format), &start_value, &stop_value);
+ gst_query_parse_segment(const_cast<GstQuery*>(gobj()), &rate,
+ (GstFormat*)(&format), &start_value, &stop_value);
}
-double QuerySegment::parse_rate()
+double QuerySegment::parse_rate() const
{
double rate;
- gst_query_parse_segment(gobj(), &rate, NULL, NULL, NULL);
+ gst_query_parse_segment(const_cast<GstQuery*>(gobj()), &rate, NULL,
+ NULL, NULL);
return rate;
}
-Format QuerySegment::parse_format()
+Format QuerySegment::parse_format() const
{
Format format;
- gst_query_parse_segment(gobj(), NULL, (GstFormat*)(&format), NULL, NULL);
+ gst_query_parse_segment(const_cast<GstQuery*>(gobj()), NULL,
+ (GstFormat*)(&format), NULL, NULL);
return format;
}
-gint64 QuerySegment::parse_start()
+gint64 QuerySegment::parse_start() const
{
gint64 start;
- gst_query_parse_segment(gobj(), NULL, NULL, &start, NULL);
+ gst_query_parse_segment(const_cast<GstQuery*>(gobj()), NULL, NULL,
+ &start, NULL);
return start;
}
-gint64 QuerySegment::parse_stop()
+gint64 QuerySegment::parse_stop() const
{
gint64 stop;
- gst_query_parse_segment(gobj(), NULL, NULL,NULL, &stop);
+ gst_query_parse_segment(const_cast<GstQuery*>(gobj()), NULL, NULL,
+ NULL, &stop);
return stop;
}
@@ -415,24 +440,27 @@
gst_query_set_buffering_percent(gobj(), busy, percent);
}
-void QueryBuffering::parse(bool& busy, int& percent)
+void QueryBuffering::parse(bool& busy, int& percent) const
{
gboolean gbusy;
- gst_query_parse_buffering_percent(gobj(), &gbusy, &percent);
+ gst_query_parse_buffering_percent(const_cast<GstQuery*>(gobj()), &gbusy,
+ &percent);
busy = gbusy;
}
-bool QueryBuffering::parse_busy()
+bool QueryBuffering::parse_busy() const
{
gboolean gbusy;
- gst_query_parse_buffering_percent(gobj(), &gbusy, NULL);
+ gst_query_parse_buffering_percent(const_cast<GstQuery*>(gobj()), &gbusy,
+ NULL);
return gbusy;
}
-int QueryBuffering::parse_percent()
+int QueryBuffering::parse_percent() const
{
int percent;
- gst_query_parse_buffering_percent(gobj(), NULL, &percent);
+ gst_query_parse_buffering_percent(const_cast<GstQuery*>(gobj()), NULL,
+ &percent);
return percent;
}
@@ -442,38 +470,41 @@
avg_out, buffering_left);
}
-void QueryBuffering::parse(BufferingMode& mode, int& avg_in, int& avg_out, gint64 buffering_left)
+void QueryBuffering::parse(BufferingMode& mode, int& avg_in, int& avg_out, gint64 buffering_left) const
{
- gst_query_parse_buffering_stats(gobj(), (GstBufferingMode*)(&mode), &avg_in,
- &avg_out, &buffering_left);
+ gst_query_parse_buffering_stats(const_cast<GstQuery*>(gobj()),
+ (GstBufferingMode*)(&mode), &avg_in, &avg_out, &buffering_left);
}
-BufferingMode QueryBuffering::parse_mode()
+BufferingMode QueryBuffering::parse_mode() const
{
BufferingMode mode;
- gst_query_parse_buffering_stats(gobj(), (GstBufferingMode*)(&mode), NULL,
- NULL, NULL);
+ gst_query_parse_buffering_stats(const_cast<GstQuery*>(gobj()),
+ (GstBufferingMode*)(&mode), NULL, NULL, NULL);
return mode;
}
-int QueryBuffering::parse_input_rate()
+int QueryBuffering::parse_input_rate() const
{
int avg_in;
- gst_query_parse_buffering_stats(gobj(), NULL, &avg_in, NULL, NULL);
+ gst_query_parse_buffering_stats(const_cast<GstQuery*>(gobj()), NULL,
+ &avg_in, NULL, NULL);
return avg_in;
}
-int QueryBuffering::parse_output_rate()
+int QueryBuffering::parse_output_rate() const
{
int avg_out;
- gst_query_parse_buffering_stats(gobj(), NULL, NULL, &avg_out, NULL);
+ gst_query_parse_buffering_stats(const_cast<GstQuery*>(gobj()), NULL, NULL,
+ &avg_out, NULL);
return avg_out;
}
-gint64 QueryBuffering::parse_time_left()
+gint64 QueryBuffering::parse_time_left() const
{
gint64 buffering_left;
- gst_query_parse_buffering_stats(gobj(), NULL, NULL, NULL, &buffering_left);
+ gst_query_parse_buffering_stats(const_cast<GstQuery*>(gobj()), NULL,
+ NULL, NULL, &buffering_left);
return buffering_left;
}
@@ -483,38 +514,41 @@
estimated_total);
}
-void QueryBuffering::parse(Format& format, gint64& start, gint64& stop, gint64& estimated_total)
+void QueryBuffering::parse(Format& format, gint64& start, gint64& stop, gint64& estimated_total) const
{
- gst_query_parse_buffering_range(gobj(), (GstFormat*)(&format), &start,
- &stop, &estimated_total);
+ gst_query_parse_buffering_range(const_cast<GstQuery*>(gobj()),
+ (GstFormat*)(&format), &start, &stop, &estimated_total);
}
-Format QueryBuffering::parse_format()
+Format QueryBuffering::parse_format() const
{
Format format;
- gst_query_parse_buffering_range(gobj(), (GstFormat*)(&format), NULL, NULL,
- NULL);
+ gst_query_parse_buffering_range(const_cast<GstQuery*>(gobj()),
+ (GstFormat*)(&format), NULL, NULL, NULL);
return format;
}
-gint64 QueryBuffering::parse_start()
+gint64 QueryBuffering::parse_start() const
{
gint64 start;
- gst_query_parse_buffering_range(gobj(), NULL, &start, NULL, NULL);
+ gst_query_parse_buffering_range(const_cast<GstQuery*>(gobj()), NULL,
+ &start, NULL, NULL);
return start;
}
-gint64 QueryBuffering::parse_stop()
+gint64 QueryBuffering::parse_stop() const
{
gint64 stop;
- gst_query_parse_buffering_range(gobj(), NULL, NULL, &stop, NULL);
+ gst_query_parse_buffering_range(const_cast<GstQuery*>(gobj()), NULL,
+ NULL, &stop, NULL);
return stop;
}
-gint64 QueryBuffering::parse_total_time()
+gint64 QueryBuffering::parse_total_time() const
{
gint64 estimated_total;
- gst_query_parse_buffering_range(gobj(), NULL, NULL, NULL, &estimated_total);
+ gst_query_parse_buffering_range(const_cast<GstQuery*>(gobj()), NULL,
+ NULL, NULL, &estimated_total);
return estimated_total;
}
Modified: gstreamermm/trunk/gstreamer/src/query.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/query.hg (original)
+++ gstreamermm/trunk/gstreamer/src/query.hg Thu Jan 22 01:25:37 2009
@@ -142,8 +142,8 @@
_WRAP_METHOD(static QueryType register_query_type(const Glib::ustring& nick, const Glib::ustring& description), gst_query_type_register)
_WRAP_METHOD(static QueryType get_query_type(const Glib::ustring& nick), gst_query_type_get_by_nick)
-#m4 _CONVERSION(`const Glib::ArrayHandle<QueryType>&',`GstQueryType*',`(GstQueryType*)(($3).data())')
- _WRAP_METHOD(static bool query_types_contain(const Glib::ArrayHandle<QueryType>& types, QueryType type), gst_query_types_contains)
+#m4 _CONVERSION(`const Glib::ArrayHandle<const QueryType>&',`GstQueryType*',`(GstQueryType*)(($3).data())')
+ _WRAP_METHOD(static bool query_types_contain(const Glib::ArrayHandle<const QueryType>& types, QueryType type), gst_query_types_contains)
/** Get details about the given Gst::QueryType.
*
@@ -151,7 +151,7 @@
* @param def A Gst::QueryTypeDefinition in which to store the details.
* @return true if successful, false otherwise.
*/
- bool get_details(QueryType type, QueryTypeDefinition& def);
+ bool get_details(QueryType type, QueryTypeDefinition& def) const;
_IGNORE(gst_query_type_get_details)
_WRAP_METHOD(static Gst::IteratorBasic<const Gst::QueryTypeDefinition> iterate_definitions(), gst_query_type_iterate_definitions)
@@ -213,36 +213,36 @@
* value.
* @param dest_value The storage for the destination value.
*/
- void parse(Format& src_format, gint64& src_value, Format& dest_format, gint64& dest_value);
+ void parse(Format& src_format, gint64& src_value, Format& dest_format, gint64& dest_value) const;
/** Parse the destination format and value of a convert query answer.
* @param dest_format The storage for the Gst::Format of the destination
* value.
* @param dest_value The storage for the destination value.
*/
- void parse(Format& dest_format, gint64& dest_value);
+ void parse(Format& dest_format, gint64& dest_value) const;
/** Parse the source format of a convert query answer, returning the format.
* @return The Gst::Format of the source value.
*/
- Format parse_src_format();
+ Format parse_src_format() const;
/** Parse the source value of a convert query answer returning, the value.
* @return The source value.
*/
- gint64 parse_src_value();
+ gint64 parse_src_value() const;
/** Parse the destination format of a convert query answer, returning the
* format.
* @return The Gst::Format of the destination value.
*/
- Format parse_dest_format();
+ Format parse_dest_format() const;
/** Parse the destination value of a convert query answer, returning the
* value.
* @return The destination value.
*/
- gint64 parse_dest_value();
+ gint64 parse_dest_value() const;
};
/** A stream position query object. See create() for more details.
@@ -273,17 +273,17 @@
* @param format The storage for the Gst::Format of the position values.
* @param position The storage for the current position.
*/
- void parse(Format& format, gint64& position);
+ void parse(Format& format, gint64& position) const;
/** Parse the position of a position query, returning the position.
* @return The current position of the position query.
*/
- gint64 parse();
+ gint64 parse() const;
/** Parse the format of a position query, returning the format.
* @return The the Gst::Format of the position values.
*/
- Format parse_format();
+ Format parse_format() const;
};
/** A stream duration query object. See create() for more details.
@@ -313,17 +313,17 @@
* @param format The storage for the Gst::Format of the duration value.
* @param duration The storage for the total duration.
*/
- void parse(Format& format, gint64& duration);
+ void parse(Format& format, gint64& duration) const;
/** Parse a duration query answer, returning the duration.
* @return The total duration.
*/
- gint64 parse();
+ gint64 parse() const;
/** Parse a duration query answer, returning the format of the duration.
* @return The Gst::Format of the duration value.
*/
- Format parse_format();
+ Format parse_format() const;
};
/** A latency query object. See create() for more details.
@@ -354,22 +354,22 @@
* @param min_latency The storage for the min latency.
* @param max_latency The storage for the max latency.
*/
- void parse(bool& live, ClockTime& min_latency, ClockTime& max_latency);
+ void parse(bool& live, ClockTime& min_latency, ClockTime& max_latency) const;
/** Parse a latency query answer, returning the live status.
* @return the live satus.
*/
- bool parse_live();
+ bool parse_live() const;
/** Parse a latency query answer, returning the minimum latency.
* @return The minimum latency.
*/
- ClockTime parse_min();
+ ClockTime parse_min() const;
/** Parse a latency query answer, returning the maximum latency.
* @return The maximum latency.
*/
- ClockTime parse_max();
+ ClockTime parse_max() const;
};
/** A seeking query object. See create() for more details.
@@ -403,27 +403,27 @@
* @param segment_start The storage location for the segment start value.
* @param segment_end The storage location for the segment end.
*/
- void parse(Format& format, bool& seekable, gint64& segment_start, gint64& segment_end);
+ void parse(Format& format, bool& seekable, gint64& segment_start, gint64& segment_end) const;
/** Parse a seeking query, returning the format.
* @return The format.
*/
- Format parse_format();
+ Format parse_format() const;
/** Parse a seeking query, returning the seekable status.
* @return The seekable flag.
*/
- bool parse_seekable();
+ bool parse_seekable() const;
/** Parse a seeking query, returning the segment start value.
* @return The segment start.
*/
- gint64 parse_start();
+ gint64 parse_start() const;
/** Parse a seeking query, returning the segment end value.
* @return The segment end.
*/
- gint64 parse_end();
+ gint64 parse_end() const;
};
/** A formats query object. See create() for more details.
@@ -456,7 +456,7 @@
/** Parse and return the number of formats in the formats query.
* @return The number of formats in this query.
*/
- guint parse_length();
+ guint parse_length() const;
/** Parse the format query and return the @a nth format from it. If the list
* contains less elements than @a nth, Gst::FORMAT_UNDEFINED will be
@@ -464,7 +464,7 @@
* @param nth The index of the format to return.
* @return the @a nth format or Gst::FORMAT_UNDEFINED.
*/
- Format parse(guint nth);
+ Format parse(guint nth) const;
};
/** A new segment query object. See create() for more details.
@@ -509,31 +509,31 @@
* @param start_value The storage for the start value.
* @param stop_value The storage for the stop value.
*/
- void parse(double& rate, Format& format, gint64& start_value, gint64& stop_value);
+ void parse(double& rate, Format& format, gint64& start_value, gint64& stop_value) const;
/** Parse a segment query answer, returning the rate. See set() for an
* explanation of the function arguments.
* @return The rate of the segment.
*/
- double parse_rate();
+ double parse_rate() const;
/** Parse a segment query answer, returning the format. See set() for an
* explanation of the function arguments.
* @return The Gst::Format of the start and stop values.
*/
- Format parse_format();
+ Format parse_format() const;
/** Parse a segment query answer, returning the start value. See set() for
* an explanation of the function arguments.
* @return The start value.
*/
- gint64 parse_start();
+ gint64 parse_start() const;
/** Parse a segment query answer, returning the stop value. See set() for
* an explanation of the function arguments.
* @return The stop value.
*/
- gint64 parse_stop();
+ gint64 parse_stop() const;
};
/** A new buffering query object. See create() for more details.
@@ -564,19 +564,19 @@
* @param busy The location to store the buffering busy flag.
* @param percent The location to store the buffering percent.
*/
- void parse(bool& busy, int& percent);
+ void parse(bool& busy, int& percent) const;
/** Get the busy flag of the buffered data. The busy indicator is true when
* the buffering is in progress.
* @return The buffering busy flag.
*/
- bool parse_busy();
+ bool parse_busy() const;
/** Get the percentage of the buffered data. The percent is a value between
* 0 and 100.
* @return The buffering percent.
*/
- int parse_percent();
+ int parse_percent() const;
/** Configures the buffering stats values in query.
* @param mode A buffering mode.
@@ -594,27 +594,27 @@
* @param buffering_left The location to store the amount of buffering time
* left.
*/
- void parse(BufferingMode& mode, int& avg_in, int& avg_out, gint64 buffering_left);
+ void parse(BufferingMode& mode, int& avg_in, int& avg_out, gint64 buffering_left) const;
/** Extracts the buffering mode from the query.
* @return The the buffering mode.
*/
- BufferingMode parse_mode();
+ BufferingMode parse_mode() const;
/** Extracts the average input rate from the query.
* @return The average input rate.
*/
- int parse_input_rate();
+ int parse_input_rate() const;
/** Extracts the average output rate from the query.
* @return The average output rate.
*/
- int parse_output_rate();
+ int parse_output_rate() const;
/** Extracts the buffering time left from the query.
* @return The the amount of buffering time left.
*/
- gint64 parse_time_left();
+ gint64 parse_time_left() const;
/** Set the available query result fields in query.
* @param format The format to set for the start and stop values.
@@ -633,27 +633,27 @@
* @param estimated_total The location to store the estimated total amount
* of download time.
*/
- void parse(Format& format, gint64& start, gint64& stop, gint64& estimated_total);
+ void parse(Format& format, gint64& start, gint64& stop, gint64& estimated_total) const;
/** Parse the query, returning the format.
* @return The format.
*/
- Format parse_format();
+ Format parse_format() const;
/** Parse the query, returning the start range value.
* @return The start value.
*/
- gint64 parse_start();
+ gint64 parse_start() const;
/** Parse the query, returning the stop range value.
* @return The stop value.
*/
- gint64 parse_stop();
+ gint64 parse_stop() const;
/** Parse the query, returning the estimated total amount of download time.
* @return The estimated total amount of download time.
*/
- gint64 parse_total_time();
+ gint64 parse_total_time() const;
};
} //namespace Gst
Modified: gstreamermm/trunk/gstreamer/src/registry.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/registry.ccg (original)
+++ gstreamermm/trunk/gstreamer/src/registry.ccg Thu Jan 22 01:25:37 2009
@@ -78,7 +78,18 @@
{
Plugin::SlotFilter* slot_copy = new Plugin::SlotFilter(filter);
GList* list = gst_registry_plugin_filter(gobj(), &Registry_Plugin_Filter_gstreamermm_callback, first, slot_copy);
- return Glib::ListHandle< Glib::RefPtr<Gst::Plugin> >(list, Glib::OWNERSHIP_DEEP);
+ return Glib::ListHandle< Glib::RefPtr<Gst::Plugin> >(list,
+ Glib::OWNERSHIP_DEEP);
+}
+
+Glib::ListHandle< Glib::RefPtr<const Gst::Plugin> >
+Registry::get_plugin_list(const Plugin::SlotFilter& filter, bool first) const
+{
+ Plugin::SlotFilter* slot_copy = new Plugin::SlotFilter(filter);
+ GList* list = gst_registry_plugin_filter(const_cast<GstRegistry*>(gobj()),
+ &Registry_Plugin_Filter_gstreamermm_callback, first, slot_copy);
+ return Glib::ListHandle< Glib::RefPtr<const Gst::Plugin> >(list,
+ Glib::OWNERSHIP_DEEP);
}
Glib::ListHandle< Glib::RefPtr<Gst::PluginFeature> >
@@ -86,7 +97,19 @@
{
PluginFeature::SlotFilter* slot_copy = new PluginFeature::SlotFilter(filter);
GList* list = gst_registry_feature_filter(gobj(), &Registry_PluginFeature_Filter_gstreamermm_callback, first, slot_copy);
- return Glib::ListHandle< Glib::RefPtr<Gst::PluginFeature> >(list, Glib::OWNERSHIP_DEEP);
+ return Glib::ListHandle< Glib::RefPtr<Gst::PluginFeature> >(list,
+ Glib::OWNERSHIP_DEEP);
+}
+
+Glib::ListHandle< Glib::RefPtr<const Gst::PluginFeature> >
+Registry::get_feature_list(const PluginFeature::SlotFilter& filter,
+ bool first) const
+{
+ PluginFeature::SlotFilter* slot_copy = new PluginFeature::SlotFilter(filter);
+ GList* list = gst_registry_feature_filter(const_cast<GstRegistry*>(gobj()),
+ &Registry_PluginFeature_Filter_gstreamermm_callback, first, slot_copy);
+ return Glib::ListHandle< Glib::RefPtr<const Gst::PluginFeature> >(list,
+ Glib::OWNERSHIP_DEEP);
}
#ifdef USE_BINARY_REGISTRY
@@ -96,9 +119,10 @@
return gst_registry_binary_read_cache(gobj(), location.c_str());
}
-bool Registry::binary_write_cache(const Glib::ustring& location)
+bool Registry::binary_write_cache(const Glib::ustring& location) const
{
- return gst_registry_binary_write_cache(gobj(), location.c_str());
+ return gst_registry_binary_write_cache(const_cast<GstRegistry*>(gobj()),
+ location.c_str());
}
#else
@@ -108,9 +132,10 @@
return gst_registry_xml_read_cache(gobj(), location.c_str());
}
-bool Registry::xml_write_cache(const Glib::ustring& location)
+bool Registry::xml_write_cache(const Glib::ustring& location) const
{
- return gst_registry_xml_write_cache(gobj(), location.c_str());
+ return gst_registry_xml_write_cache(const_cast<GstRegistry*>(gobj()),
+ location.c_str());
}
#endif
Modified: gstreamermm/trunk/gstreamer/src/registry.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/registry.hg (original)
+++ gstreamermm/trunk/gstreamer/src/registry.hg Thu Jan 22 01:25:37 2009
@@ -96,14 +96,22 @@
#m4 _CONVERSION(`GList*',`Glib::ListHandle< Glib::RefPtr<Gst::PluginFeature> >',`$2($3, Glib::OWNERSHIP_DEEP)')
_WRAP_METHOD(Glib::ListHandle< Glib::RefPtr<Gst::PluginFeature> > get_feature_list(GType type), gst_registry_get_feature_list)
+
+#m4 _CONVERSION(`GList*',`Glib::ListHandle< Glib::RefPtr<const Gst::PluginFeature> >',`$2($3, Glib::OWNERSHIP_DEEP)')
+ _WRAP_METHOD(Glib::ListHandle< Glib::RefPtr<const Gst::PluginFeature> > get_feature_list(GType type) const, gst_registry_get_feature_list)
+
_WRAP_METHOD(Glib::ListHandle< Glib::RefPtr<Gst::PluginFeature> > get_feature_list(const Glib::ustring& name), gst_registry_get_feature_list_by_plugin)
+ _WRAP_METHOD(Glib::ListHandle< Glib::RefPtr<const Gst::PluginFeature> > get_feature_list(const Glib::ustring& name) const, gst_registry_get_feature_list_by_plugin)
#m4 _CONVERSION(`GList*',`Glib::ListHandle< Glib::ustring >',`$2($3, Glib::OWNERSHIP_DEEP)')
- _WRAP_METHOD(Glib::ListHandle< Glib::ustring > get_path_list(), gst_registry_get_path_list)
+ _WRAP_METHOD(Glib::ListHandle< Glib::ustring > get_path_list() const, gst_registry_get_path_list)
#m4 _CONVERSION(`GList*',`Glib::ListHandle< Glib::RefPtr<Gst::Plugin> >',`$2($3, Glib::OWNERSHIP_DEEP)')
_WRAP_METHOD(Glib::ListHandle< Glib::RefPtr<Gst::Plugin> > get_plugin_list(), gst_registry_get_plugin_list)
+#m4 _CONVERSION(`GList*',`Glib::ListHandle< Glib::RefPtr<const Gst::Plugin> >',`$2($3, Glib::OWNERSHIP_DEEP)')
+ _WRAP_METHOD(Glib::ListHandle< Glib::RefPtr<const Gst::Plugin> > get_plugin_list() const, gst_registry_get_plugin_list)
+
_WRAP_METHOD(bool add_plugin(const Glib::RefPtr<Gst::Plugin>& plugin), gst_registry_add_plugin)
_WRAP_METHOD(void remove_plugin(const Glib::RefPtr<Gst::Plugin>& plugin), gst_registry_remove_plugin)
@@ -119,6 +127,17 @@
Glib::ListHandle< Glib::RefPtr<Gst::Plugin> > get_plugin_list(const Plugin::SlotFilter& filter, bool first);
_IGNORE(gst_registry_plugin_filter)
+ /** Runs a filter against all plugins in the registry and returns a List with
+ * the results. If the first flag is set, only the first match is returned
+ * (as a list with a single object).
+ *
+ * @param filter The filter to use.
+ * @param first Only return first match.
+ * @return A list of Gst::Plugin. MT safe.
+ *
+ */
+ Glib::ListHandle< Glib::RefPtr<const Gst::Plugin> > get_plugin_list(const Plugin::SlotFilter& filter, bool first) const;
+
/** Runs a filter against all features of the plugins in the registry and
* returns a List with the results. If the first flag is set, only the first
* match is returned (as a list with a single object).
@@ -131,9 +150,23 @@
Glib::ListHandle< Glib::RefPtr<Gst::PluginFeature> > get_feature_list(const PluginFeature::SlotFilter& filter, bool first);
_IGNORE(gst_registry_feature_filter)
+ /** Runs a filter against all features of the plugins in the registry and
+ * returns a List with the results. If the first flag is set, only the first
+ * match is returned (as a list with a single object).
+ *
+ * @param registry Registry to query.
+ * @param filter The filter to use.
+ * @param first Only return first match.
+ * @return A list of Gst::PluginFeature. MT safe.
+ */
+ Glib::ListHandle< Glib::RefPtr<const Gst::PluginFeature> > get_feature_list(const PluginFeature::SlotFilter& filter, bool first) const;
+
_WRAP_METHOD(Glib::RefPtr<Gst::Plugin> find_plugin(const Glib::ustring& name), gst_registry_find_plugin)
+ _WRAP_METHOD(Glib::RefPtr<const Gst::Plugin> find_plugin(const Glib::ustring& name) const, gst_registry_find_plugin, constversion)
_WRAP_METHOD(Glib::RefPtr<Gst::PluginFeature> find_feature(const Glib::ustring& name, GType type), gst_registry_find_feature)
+ _WRAP_METHOD(Glib::RefPtr<const Gst::PluginFeature> find_feature(const Glib::ustring& name, GType type) const, gst_registry_find_feature, constversion)
_WRAP_METHOD(Glib::RefPtr<Gst::PluginFeature> lookup_feature(const Glib::ustring& name), gst_registry_lookup_feature)
+ _WRAP_METHOD(Glib::RefPtr<const Gst::PluginFeature> lookup_feature(const Glib::ustring& name) const, gst_registry_lookup_feature, constversion)
_WRAP_METHOD(void add_path(const Glib::ustring& path), gst_registry_add_path)
_WRAP_METHOD(void scan_path(const Glib::ustring& path), gst_registry_scan_path)
// binary or xml registry cache depends on USE_BINARY_REGISTRY def in
@@ -153,7 +186,7 @@
* @param location A filename.
* @return true on success.
*/
- void binary_write_cache(const Glib::ustring& location);
+ void binary_write_cache(const Glib::ustring& location) const;
#else
/** Read the contents of the XML cache file at location into registry.
*
@@ -169,11 +202,12 @@
* @param location A filename.
* @return true on success.
*/
- bool xml_write_cache(const Glib::ustring& location);
+ bool xml_write_cache(const Glib::ustring& location) const;
_IGNORE(gst_registry_xml_write_cache)
#endif
_WRAP_METHOD(Glib::RefPtr<Gst::Plugin> lookup(const Glib::ustring& filename), gst_registry_lookup)
+ _WRAP_METHOD(Glib::RefPtr<const Gst::Plugin> lookup(const Glib::ustring& filename) const, gst_registry_lookup, constversion)
_WRAP_METHOD(void remove_feature(const Glib::RefPtr<Gst::PluginFeature>& feature), gst_registry_remove_feature)
_WRAP_METHOD(void add_feature(const Glib::RefPtr<Gst::PluginFeature>& feature), gst_registry_add_feature)
_WRAP_METHOD(static bool check_feature_version(const Glib::ustring& feature_name, guint min_major, guint min_minor, guint min_micro), gst_default_registry_check_feature_version)
@@ -185,7 +219,6 @@
*/
_WRAP_SIGNAL(void feature_added(const Glib::RefPtr<Gst::PluginFeature>& feature), "feature-added")
-
#m4 _CONVERSION(`GstPlugin*',`const Glib::RefPtr<Gst::Plugin>&',`Glib::wrap($3, true)')
/** Signals that a plugin has been added to the registry (possibly replacing
Modified: gstreamermm/trunk/gstreamer/src/segment.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/segment.hg (original)
+++ gstreamermm/trunk/gstreamer/src/segment.hg Thu Jan 22 01:25:37 2009
@@ -90,15 +90,15 @@
_IGNORE(gst_segment_free, gst_segment_copy)
public:
- _WRAP_METHOD(bool clip(Format format, gint64 start, gint64 stop, gint64& clip_start, gint64& clip_stop), gst_segment_clip)
+ _WRAP_METHOD(bool clip(Format format, gint64 start, gint64 stop, gint64& clip_start, gint64& clip_stop) const, gst_segment_clip)
_WRAP_METHOD(void init(Format format), gst_segment_init)
_WRAP_METHOD(void set_duration(Format format, gint64 duration), gst_segment_set_duration)
_WRAP_METHOD(void set_last_stop(Format format, gint64 position), gst_segment_set_last_stop)
_WRAP_METHOD(void set_newsegment(bool update, double rate, Format format, gint64 start, gint64 stop, gint64 time), gst_segment_set_newsegment)
_WRAP_METHOD(void set_newsegment(bool update, double rate, double applied_rate, Format format, gint64 start, gint64 stop, gint64 time), gst_segment_set_newsegment_full)
_WRAP_METHOD(void set_seek(double rate, Format format, SeekFlags flags, SeekType start_type, gint64 start, SeekType stop_type, gint64 stop, bool& update), gst_segment_set_seek)
- _WRAP_METHOD(gint64 convert_to_running_time(Format format, gint64 position), gst_segment_to_running_time)
- _WRAP_METHOD(gint64 convert_to_stream_time(Format format, gint64 position), gst_segment_to_stream_time)
+ _WRAP_METHOD(gint64 convert_to_running_time(Format format, gint64 position) const, gst_segment_to_running_time)
+ _WRAP_METHOD(gint64 convert_to_stream_time(Format format, gint64 position) const, gst_segment_to_stream_time)
};
} //namespace Gst
Modified: gstreamermm/trunk/gstreamer/src/taglist.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/taglist.ccg (original)
+++ gstreamermm/trunk/gstreamer/src/taglist.ccg Thu Jan 22 01:25:37 2009
@@ -60,14 +60,18 @@
delete slot_copy;
}
-bool TagList::get(const Glib::ustring& tag, Glib::ValueBase& dest)
+bool TagList::get(const Glib::ustring& tag, Glib::ValueBase& dest) const
{
- return gst_tag_list_copy_value(dest.gobj(), gobj(), tag.c_str());
+ return gst_tag_list_copy_value(dest.gobj(), const_cast<GstTagList*>(gobj()),
+ tag.c_str());
}
-bool TagList::get(const Glib::ustring& tag, guint index, Glib::ValueBase& value)
+bool TagList::get(const Glib::ustring& tag, guint index,
+ Glib::ValueBase& value) const
{
- const GValue* gst_value = gst_tag_list_get_value_index(gobj(), tag.c_str(), index);
+ const GValue* gst_value =
+ gst_tag_list_get_value_index(const_cast<GstTagList*>(gobj()),
+ tag.c_str(), index);
if (gst_value)
{
value.init(gst_value);
Modified: gstreamermm/trunk/gstreamer/src/taglist.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/taglist.hg (original)
+++ gstreamermm/trunk/gstreamer/src/taglist.hg Thu Jan 22 01:25:37 2009
@@ -287,7 +287,7 @@
*
* @param tag The tag name.
* @param mode The mode to use.
- * @param value The GValue to set.
+ * @param value The Glib::Value<> to use.
*/
void add(const Glib::ustring& tag, const Glib::ValueBase& value, TagMergeMode mode=TAG_MERGE_PREPEND);
@@ -334,7 +334,7 @@
* @return true, if a value was copied, false if the tag didn't exist in the
* list.
*/
- bool get(const Glib::ustring& tag, Glib::ValueBase& dest);
+ bool get(const Glib::ustring& tag, Glib::ValueBase& dest) const;
_IGNORE(gst_tag_list_copy_value)
/** Gets the value that is at the given index for the given tag.
@@ -345,7 +345,7 @@
* @return true if tag was available and had right number of entries, false
* otherwise.
*/
- bool get(const Glib::ustring& tag, guint index, Glib::ValueBase& dest);
+ bool get(const Glib::ustring& tag, guint index, Glib::ValueBase& dest) const;
_IGNORE(gst_tag_list_get_value_index)
/** Copies the contents for the given tag into the value, merging multiple
@@ -355,7 +355,8 @@
* @return true, if a value was copied, false if the tag didn't exist in the
* given list.
*/
- template<class DataType> bool get(const Glib::ustring& tag, DataType& value);
+ template<class DataType>
+ bool get(const Glib::ustring& tag, DataType& value) const;
_IGNORE(gst_tag_list_get_char,
gst_tag_list_get_uchar,
gst_tag_list_get_boolean,
@@ -377,7 +378,8 @@
* @return true, if a value was copied, false if the tag didn't exist in the
* given list.
*/
- template<class DataType> bool get(const Glib::ustring& tag, guint index, DataType& value);
+ template<class DataType>
+ bool get(const Glib::ustring& tag, guint index, DataType& value) const;
_IGNORE(gst_tag_list_get_char_index,
gst_tag_list_get_uchar_index,
gst_tag_list_get_boolean_index,
@@ -399,7 +401,8 @@
/***************************** Gst::TagList *****************************/
template <class DataType>
-void TagList::add(const Glib::ustring& tag, const DataType& data, TagMergeMode mode)
+void TagList::add(const Glib::ustring& tag, const DataType& data,
+ TagMergeMode mode)
{
typedef Glib::Value<DataType> ValueType;
@@ -410,7 +413,7 @@
}
template<class DataType>
-bool TagList::get(const Glib::ustring& tag, DataType& data)
+bool TagList::get(const Glib::ustring& tag, DataType& data) const
{
Glib::Value<DataType> value;
bool result = this->get(tag, (Glib::ValueBase&) value);
@@ -422,7 +425,7 @@
}
template<class DataType>
-bool TagList::get(const Glib::ustring& tag, guint index, DataType& data)
+bool TagList::get(const Glib::ustring& tag, guint index, DataType& data) const
{
Glib::Value<DataType> value;
bool result = this->get(tag, index, (Glib::ValueBase&) value);
@@ -435,5 +438,4 @@
#endif /* DOXYGEN_SHOULD_SKIP_THIS */
-
} //namespace Gst
Modified: gstreamermm/trunk/gstreamer/src/tagsetter.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/tagsetter.hg (original)
+++ gstreamermm/trunk/gstreamer/src/tagsetter.hg Thu Jan 22 01:25:37 2009
@@ -48,6 +48,7 @@
_CLASS_INTERFACE(TagSetter, GstTagSetter, GST_TAG_SETTER, GstTagSetterIFace)
public:
+ _WRAP_METHOD(void reset_tags(), gst_tag_setter_reset_tags)
_WRAP_METHOD(void merge_tags(const Gst::TagList& list, TagMergeMode mode=TAG_MERGE_PREPEND), gst_tag_setter_merge_tags)
/** Adds the given Glib::ValueBase on the setter using the given merge mode.
@@ -77,9 +78,9 @@
*/
void add_tag(const Glib::ustring& tag, const char* data, TagMergeMode mode=TAG_MERGE_PREPEND);
- _WRAP_METHOD(Gst::TagList get_tag_list(), gst_tag_setter_get_tag_list)
+ _WRAP_METHOD(const Gst::TagList get_tag_list() const, gst_tag_setter_get_tag_list)
_WRAP_METHOD(void set_tag_merge_mode(TagMergeMode mode), gst_tag_setter_set_tag_merge_mode)
- _WRAP_METHOD(TagMergeMode qet_tag_merge_mode(), gst_tag_setter_get_tag_merge_mode)
+ _WRAP_METHOD(TagMergeMode get_tag_merge_mode() const, gst_tag_setter_get_tag_merge_mode)
//Variable argument functions are ignored.
_IGNORE(gst_tag_setter_add_tags, gst_tag_setter_add_tag_values)
Modified: gstreamermm/trunk/gstreamer/src/task.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/task.ccg (original)
+++ gstreamermm/trunk/gstreamer/src/task.ccg Thu Jan 22 01:25:37 2009
@@ -58,7 +58,7 @@
gobj()->data = &slot;
}
-bool Task::_slot_set(bool mark_set)
+bool Task::_slot_set(bool mark_set) const
{
static bool slot_set = false;
Modified: gstreamermm/trunk/gstreamer/src/task.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/task.hg (original)
+++ gstreamermm/trunk/gstreamer/src/task.hg Thu Jan 22 01:25:37 2009
@@ -86,7 +86,7 @@
_WRAP_CREATE(const SlotTask& task_slot);
_WRAP_METHOD(static void cleanup_all(), gst_task_cleanup_all)
- _WRAP_METHOD(TaskState get_state(), gst_task_get_state)
+ _WRAP_METHOD(TaskState get_state() const, gst_task_get_state)
_WRAP_METHOD(bool join(), gst_task_join)
_WRAP_METHOD(bool pause(), gst_task_pause)
_WRAP_METHOD(void set_lock(Glib::StaticRecMutex& mutex), gst_task_set_lock)
@@ -96,7 +96,7 @@
#ifndef DOXYGEN_SHOULD_SKIP_THIS
private:
SlotTask* slot;
- bool _slot_set(bool mark_set = false);
+ bool _slot_set(bool mark_set = false) const;
#endif
};
Modified: gstreamermm/trunk/gstreamer/src/urihandler.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/urihandler.hg (original)
+++ gstreamermm/trunk/gstreamer/src/urihandler.hg Thu Jan 22 01:25:37 2009
@@ -62,18 +62,20 @@
_WRAP_METHOD(static Glib::ustring construct_uri(const Glib::ustring& protocol, const Glib::ustring& location), gst_uri_construct)
_WRAP_METHOD(static Glib::RefPtr<Gst::Element> make_element_from_uri(const URIType type, const Glib::ustring& uri, const Glib::ustring& name), gst_element_make_from_uri)
- _WRAP_METHOD(guint get_uri_type(), gst_uri_handler_get_uri_type)
+ _WRAP_METHOD(guint get_uri_type() const, gst_uri_handler_get_uri_type)
#m4 _CONVERSION(`gchar**',`Glib::StringArrayHandle',`Glib::StringArrayHandle($3, Glib::OWNERSHIP_SHALLOW)')
- _WRAP_METHOD(Glib::StringArrayHandle get_protocols(), gst_uri_handler_get_protocols)
+ _WRAP_METHOD(Glib::StringArrayHandle get_protocols() const, gst_uri_handler_get_protocols)
- _WRAP_METHOD(Glib::ustring get_uri(), gst_uri_handler_get_uri)
+ _WRAP_METHOD(Glib::ustring get_uri() const, gst_uri_handler_get_uri)
_WRAP_METHOD(bool set_uri(const Glib::ustring& uri), gst_uri_handler_set_uri)
_WRAP_METHOD(void new_uri(const Glib::ustring& uri), gst_uri_handler_new_uri)
/** This signal is emitted when the URI of the uri handler has changed.
*/
_WRAP_SIGNAL(void new_uri(const Glib::ustring& uri), "new-uri")
+
+ //TODO: Wrap vfuncs.
};
} // namespace Gst
Modified: gstreamermm/trunk/gstreamer/src/value.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/value.ccg (original)
+++ gstreamermm/trunk/gstreamer/src/value.ccg Thu Jan 22 01:25:37 2009
@@ -44,14 +44,14 @@
: first(0), second(0), third(0), fourth(0)
{
guint32 fourcc = GST_STR_FOURCC(s.c_str());
- get_ccs(fourcc);
+ set_ccs(fourcc);
}
Fourcc::Fourcc(guint32 fourcc)
: first(0), second(0), third(0), fourth(0)
{
- get_ccs(fourcc);
+ set_ccs(fourcc);
}
Fourcc::Fourcc(const Fourcc& f)
@@ -64,7 +64,7 @@
if(G_VALUE_TYPE(value.gobj()) == GST_TYPE_FOURCC)
{
int fourcc = gst_value_get_fourcc(value.gobj());
- get_ccs(fourcc);
+ set_ccs(fourcc);
}
}
@@ -73,7 +73,7 @@
return GST_MAKE_FOURCC(first, second, third, fourth);
}
-void Fourcc::get_ccs(guint32 fourcc)
+void Fourcc::set_ccs(guint32 fourcc)
{
first = fourcc & 0xff;
second = (fourcc >> 8) & 0xff;
Modified: gstreamermm/trunk/gstreamer/src/value.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/value.hg (original)
+++ gstreamermm/trunk/gstreamer/src/value.hg Thu Jan 22 01:25:37 2009
@@ -94,7 +94,7 @@
char fourth;
private:
- void get_ccs(guint32 fourcc);
+ void set_ccs(guint32 fourcc);
};
@@ -133,7 +133,7 @@
/** Constructs a Gst::Fraction (num/denom)
*/
- explicit Fraction(int num, int denom);
+ Fraction(int num, int denom);
/** Constructs a Gst::Fraction from a GST_TYPE_FRACTION
*/
Modified: gstreamermm/trunk/gstreamer/src/xml.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/xml.ccg (original)
+++ gstreamermm/trunk/gstreamer/src/xml.ccg Thu Jan 22 01:25:37 2009
@@ -28,17 +28,12 @@
namespace Gst
{
-bool XML::parse_memory(const std::string& buffer, const Glib::ustring& root)
-{
- return gst_xml_parse_memory(this->gobj(),(guchar*)(buffer.c_str()), buffer.size(), root.c_str());
-}
-
-xmlDocPtr XML::write(const Glib::RefPtr<Gst::Element>& element)
+xmlDocPtr XML::write(const Glib::RefPtr<const Gst::Element>& element)
{
- return gst_xml_write(element->gobj());
+ return gst_xml_write(const_cast<GstElement*>(element->gobj()));
}
-void XML::write_to_stream(const Glib::RefPtr<Gst::Element>& element, std::ostream& out)
+void XML::write_to_stream(const Glib::RefPtr<const Gst::Element>& element, std::ostream& out)
{
xmlDocPtr xmlDoc = write(element);
xmlpp::Node rootNode(xmlDocGetRootElement(xmlDoc));
@@ -50,4 +45,9 @@
xmlFreeDoc(xmlDoc);
}
+bool XML::parse_memory(const std::string& buffer, const Glib::ustring& root)
+{
+ return gst_xml_parse_memory(this->gobj(),(guchar*)(buffer.c_str()), buffer.size(), root.c_str());
+}
+
} //namespace Gst
Modified: gstreamermm/trunk/gstreamer/src/xml.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/xml.hg (original)
+++ gstreamermm/trunk/gstreamer/src/xml.hg Thu Jan 22 01:25:37 2009
@@ -56,7 +56,7 @@
* @param element The element to write out.
* @return A pointer to an XML document.
*/
- static xmlDocPtr write(const Glib::RefPtr<Gst::Element>& element);
+ static xmlDocPtr write(const Glib::RefPtr<const Gst::Element>& element);
/** Converts the given element into XML and writes the formatted XML to an
* open output stream.
@@ -64,7 +64,7 @@
* @param element The element to write out.
* @param out An open std::ostream, like std::cout.
*/
- static void write_to_stream(const Glib::RefPtr<Gst::Element>& element, std::ostream& out);
+ static void write_to_stream(const Glib::RefPtr<const Gst::Element>& element, std::ostream& out);
_WRAP_METHOD(bool parse_doc(xmlpp::Document* doc, Glib::ustring& root), gst_xml_parse_doc)
_WRAP_METHOD(bool parse_file(const std::string& filename, const Glib::ustring& root), gst_xml_parse_file)
@@ -79,7 +79,6 @@
bool parse_memory(const std::string& buffer, const Glib::ustring& root);
_IGNORE(gst_xml_parse_memory)
- //Note: gst_xml_get_element() returns a reference (GstElement*).
_WRAP_METHOD(Glib::RefPtr<Gst::Element> get_element(const Glib::ustring& name), gst_xml_get_element)
_WRAP_METHOD(Glib::RefPtr<const Gst::Element> get_element(const Glib::ustring& name) const, gst_xml_get_element, constversion)
@@ -94,6 +93,7 @@
#m4 _CONVERSION(`GstObject*',`const Glib::RefPtr<Gst::Object>&',`Glib::wrap($3, true)')
/** Signals that a new object has been deserialized.
*/
+ //TODO: use xmlpp::Node* for signal:
_WRAP_SIGNAL(void object_loaded(const Glib::RefPtr<Gst::Object>& object, xmlNode* xml_node), "object-loaded")
};
Modified: gstreamermm/trunk/gstreamer/src/xoverlay.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/xoverlay.hg (original)
+++ gstreamermm/trunk/gstreamer/src/xoverlay.hg Thu Jan 22 01:25:37 2009
@@ -108,6 +108,8 @@
_WRAP_METHOD(void prepare_xwindow_id(), gst_x_overlay_prepare_xwindow_id)
_WRAP_METHOD(void expose(), gst_x_overlay_expose)
_WRAP_METHOD(void handle_events(bool handle_events), gst_x_overlay_handle_events)
+
+ //TODO: Wrap vfuncs.
};
} // namespace Gst
Modified: gstreamermm/trunk/tools/m4/convert_gst.m4
==============================================================================
--- gstreamermm/trunk/tools/m4/convert_gst.m4 (original)
+++ gstreamermm/trunk/tools/m4/convert_gst.m4 Thu Jan 22 01:25:37 2009
@@ -150,7 +150,7 @@
_CONVERSION(`const Gst::TagList&',`const GstTagList*',`(($3).gobj())')
_CONVERSION(`GstTagList*',`Gst::TagList',`Glib::wrap($3, 0, true)')
_CONVERSION(`Gst::TagList&',`GstTagList*',`($3).gobj()')
-_CONVERSION(`const GstTagList*',`Gst::TagList',`Glib::wrap(const_cast<GstTagList*>($3), 0, true)')
+_CONVERSION(`const GstTagList*',`const Gst::TagList',`Glib::wrap(const_cast<GstTagList*>($3), 0, true)')
_CONVERSION(`Gst::TagList',`GstTagList*',`($3).gobj()')
#URIHandler
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
