gnomemm r1692 - in gstreamermm/trunk: . examples/media_player_gtkmm examples/ogg_player examples/ogg_player_gtkmm gstreamer/src

[jaalburqu svn gnome org]

Author: jaalburqu
Date: Tue Aug 26 01:39:02 2008
New Revision: 1692
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1692&view=rev

Log:
2008-08-25  Josà Alburquerque  <jaalburqu svn gnome org>

	* gstreamer/src/element.hg: Removed get_pad() (was a TODO).

	* examples/media_player_gtkmm/player_window.cc:
	* examples/ogg_player/main.cc:
        * examples/ogg_player_gtkmm/main.cc: Changed examples to not use
        Gst::Element::get_pad() which is removed.

	* gstreamer/src/bus.hg: Made TODO more specific (for future
        completion).

Modified:
   gstreamermm/trunk/ChangeLog
   gstreamermm/trunk/examples/media_player_gtkmm/player_window.cc
   gstreamermm/trunk/examples/ogg_player/main.cc
   gstreamermm/trunk/examples/ogg_player_gtkmm/main.cc
   gstreamermm/trunk/gstreamer/src/bus.hg
   gstreamermm/trunk/gstreamer/src/element.hg

Modified: gstreamermm/trunk/examples/media_player_gtkmm/player_window.cc
==============================================================================
--- gstreamermm/trunk/examples/media_player_gtkmm/player_window.cc	(original)
+++ gstreamermm/trunk/examples/media_player_gtkmm/player_window.cc	Tue Aug 26 01:39:02 2008
@@ -268,7 +268,7 @@
   // video_pad_got_buffer method never got a chance to remove probe)
   if(m_pad_probe_id != 0)
   {
-    m_video_sink->get_pad("sink")->remove_buffer_probe(m_pad_probe_id);
+    m_video_sink->get_static_pad("sink")->remove_buffer_probe(m_pad_probe_id);
     m_pad_probe_id  = 0;
   }
 }
@@ -374,7 +374,7 @@
     // method (if there's video).  When first buffer arrives, video
     // size can be extracted.  If there's no video, probe will be
     // removed when media stops in on_button_stop method
-    m_pad_probe_id = m_video_sink->get_pad("sink")->add_buffer_probe(
+    m_pad_probe_id = m_video_sink->get_static_pad("sink")->add_buffer_probe(
       sigc::mem_fun(*this, &PlayerWindow::on_video_pad_got_buffer));
 
     set_title( Glib::filename_display_basename(chooser.get_filename()) );

Modified: gstreamermm/trunk/examples/ogg_player/main.cc
==============================================================================
--- gstreamermm/trunk/examples/ogg_player/main.cc	(original)
+++ gstreamermm/trunk/examples/ogg_player/main.cc	Tue Aug 26 01:39:02 2008
@@ -100,7 +100,7 @@
 {
   // We can now link this pad with the audio decoder
   std::cout << "Dynamic pad created. Linking parser/decoder." << std::endl;
-  Glib::RefPtr<Gst::Pad> sinkPad = decoder->get_pad("sink");
+  Glib::RefPtr<Gst::Pad> sinkPad = decoder->get_static_pad("sink");
 
   try
   {
@@ -174,7 +174,7 @@
     return -1;
   }
 
-  Glib::RefPtr<Gst::Pad> pad = sink->get_pad("sink");
+  Glib::RefPtr<Gst::Pad> pad = sink->get_static_pad("sink");
   if(pad)
     data_probe_id = pad->add_data_probe( sigc::ptr_fun(&on_sink_pad_have_data) );
   //std::cout << "sink data probe id = " << data_probe_id << std::endl;

Modified: gstreamermm/trunk/examples/ogg_player_gtkmm/main.cc
==============================================================================
--- gstreamermm/trunk/examples/ogg_player_gtkmm/main.cc	(original)
+++ gstreamermm/trunk/examples/ogg_player_gtkmm/main.cc	Tue Aug 26 01:39:02 2008
@@ -34,7 +34,7 @@
 void on_parser_pad_added(const Glib::RefPtr<Gst::Pad>& newPad)
 {
   // We can now link this pad with the audio decoder.
-  Glib::RefPtr<Gst::Pad> sinkPad = decoder->get_pad("sink");
+  Glib::RefPtr<Gst::Pad> sinkPad = decoder->get_static_pad("sink");
 
   try
   {

Modified: gstreamermm/trunk/gstreamer/src/bus.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/bus.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/bus.hg	Tue Aug 26 01:39:02 2008
@@ -41,8 +41,6 @@
  */
 _WRAP_ENUM(BusSyncReply, GstBusSyncReply)
 
-//TODO: Correct C API reference in class docs below:
-
 /** Gst::Bus â Asynchronous message bus subsystem.
  * The Gst::Bus is an object responsible for delivering Messages in a first-in
  * first-out way from the streaming threads to the application.
@@ -55,6 +53,7 @@
  * The Gst::Bus provides support for GSource based notifications. This makes it
  * possible to handle the delivery in the glib mainloop.
  *
+ * //TODO: Correct C API reference in paragraph below:
  * The GSource callback function gst_bus_async_signal_func() can be used to
  * convert all bus messages into signal emissions.
  *

Modified: gstreamermm/trunk/gstreamer/src/element.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/element.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/element.hg	Tue Aug 26 01:39:02 2008
@@ -148,11 +148,6 @@
   Glib::RefPtr<Element> link(const Glib::RefPtr<Element>& dest);
 
   _WRAP_METHOD(bool add_pad(const Glib::RefPtr<Pad>& pad), gst_element_add_pad)
-  //TODO: Remove this (and make sure it is really deprecated in the C API),
-  //because the C API says it should not be used because it has unclear refcounting:
-  //I asked for that in http://bugzilla.gnome.org/show_bug.cgi?id=533865
-  _WRAP_METHOD(Glib::RefPtr<Pad> get_pad(const Glib::ustring& name), gst_element_get_pad)
-
   _WRAP_METHOD(void create_all_pads(), gst_element_create_all_pads)
 
   //TODO: Can these be const?
@@ -214,7 +209,7 @@
   _WRAP_METHOD(void lost_state(), gst_element_lost_state)
   _WRAP_METHOD(bool sync_state_with_parent(), gst_element_sync_state_with_parent)
   _WRAP_METHOD(StateChangeReturn change_state(StateChange transition), gst_element_change_state)
-  _WRAP_METHOD(void found_tags(const TagList& list), gst_element_found_tags) //TODO: Use return value instead?
+  _WRAP_METHOD(void found_tags(const TagList& list), gst_element_found_tags)
   _WRAP_METHOD(void found_tags_for_pad(const Glib::RefPtr<Pad>& pad, const TagList& list), gst_element_found_tags_for_pad)
 
   //TODO: Change the parameter order?