gnomemm r1821 - in gstreamermm/trunk: . examples/ogg_player_gtkmm gstreamerbase

[jaalburqu svn gnome org]

Author: jaalburqu
Date: Mon Dec  1 02:39:27 2008
New Revision: 1821
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1821&view=rev

Log:
2008-11-30  Josà Alburquerque  <jaalburqu svn gnome org>

	* examples/ogg_player_gtkmm/main.cc:
	* examples/ogg_player_gtkmm/player_window.cc:
	* examples/ogg_player_gtkmm/player_window.h: Modify example to use
	Gst::FileSrc for source element.

	* gstreamerbase/gstreamerbasemm.h: Correct typo.

Modified:
   gstreamermm/trunk/ChangeLog
   gstreamermm/trunk/examples/ogg_player_gtkmm/main.cc
   gstreamermm/trunk/examples/ogg_player_gtkmm/player_window.cc
   gstreamermm/trunk/examples/ogg_player_gtkmm/player_window.h
   gstreamermm/trunk/gstreamerbase/gstreamerbasemm.h

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	Mon Dec  1 02:39:27 2008
@@ -25,6 +25,7 @@
 #include <gstreamermm/elementfactory.h>
 #include <gstreamermm/pad.h>
 #include <gstreamermm/pipeline.h>
+#include <gstreamermm/filesrc.h>
 #include <iostream>
 #include "player_window.h"
 
@@ -57,7 +58,7 @@
 
   // Create the elements
   // Reads file from disk
-  Glib::RefPtr<Gst::Element> source = Gst::ElementFactory::create_element("filesrc");
+  Glib::RefPtr<Gst::FileSrc> source = Gst::FileSrc::create();
   if(!source)
   {
     std::cerr << "filesrc element could not be created" << std::endl;

Modified: gstreamermm/trunk/examples/ogg_player_gtkmm/player_window.cc
==============================================================================
--- gstreamermm/trunk/examples/ogg_player_gtkmm/player_window.cc	(original)
+++ gstreamermm/trunk/examples/ogg_player_gtkmm/player_window.cc	Mon Dec  1 02:39:27 2008
@@ -31,7 +31,8 @@
 #include <iomanip>
 #include "player_window.h"
 
-PlayerWindow::PlayerWindow(const Glib::RefPtr<Gst::Element>& source_element, const Glib::RefPtr<Gst::Pipeline>& main_pipeline)
+PlayerWindow::PlayerWindow(const Glib::RefPtr<Gst::FileSrc>& source_element,
+  const Glib::RefPtr<Gst::Pipeline>& main_pipeline)
 : m_vbox(false, 5),
   m_progress_label("000:00:00.000000000 / 000:00:00.000000000"),
   m_play_button(Gtk::Stock::MEDIA_PLAY),
@@ -288,9 +289,8 @@
     working_dir = chooser.get_current_folder();
 
     // Set filename property on the file source. 
-    // TODO: Create a FileSrc class that we can dynamic_cast<> to, so we can use property_location()?
     const std::string filename = chooser.get_filename(); //TODO: Can this use a URI?
-    m_source_element->set_property("location", filename);
+    m_source_element->property_location() = filename;
     set_title( Glib::filename_display_basename(filename) );
 
     m_play_button.set_sensitive();

Modified: gstreamermm/trunk/examples/ogg_player_gtkmm/player_window.h
==============================================================================
--- gstreamermm/trunk/examples/ogg_player_gtkmm/player_window.h	(original)
+++ gstreamermm/trunk/examples/ogg_player_gtkmm/player_window.h	Mon Dec  1 02:39:27 2008
@@ -30,17 +30,22 @@
 #include <gtkmm/scale.h>
 #include <gstreamermm/element.h>
 #include <gstreamermm/pipeline.h>
+#include <gstreamermm/filesrc.h>
 
 class PlayerWindow : public Gtk::Window
 {
 public:
-  PlayerWindow(const Glib::RefPtr<Gst::Element>& sourceElement, const Glib::RefPtr<Gst::Pipeline>& mainPipeline);
+  PlayerWindow(const Glib::RefPtr<Gst::FileSrc>& sourceElement,
+    const Glib::RefPtr<Gst::Pipeline>& mainPipeline);
+
   virtual ~PlayerWindow();
 
 protected:
 
   //Signal handlers:
-  bool on_bus_message(const Glib::RefPtr<Gst::Bus>& bus, const Glib::RefPtr<Gst::Message>& message);
+  bool on_bus_message(const Glib::RefPtr<Gst::Bus>& bus,
+    const Glib::RefPtr<Gst::Message>& message);
+
   void on_button_play();
   void on_button_pause();
   void on_button_stop();
@@ -63,7 +68,7 @@
   Gtk::Button m_forward_button;
   Gtk::Button m_open_button;
 
-  Glib::RefPtr<Gst::Element> m_source_element;
+  Glib::RefPtr<Gst::FileSrc> m_source_element;
   Glib::RefPtr<Gst::Pipeline> m_main_pipeline;
   sigc::connection m_progress_connection;
   unsigned int m_watch_id;

Modified: gstreamermm/trunk/gstreamerbase/gstreamerbasemm.h
==============================================================================
--- gstreamermm/trunk/gstreamerbase/gstreamerbasemm.h	(original)
+++ gstreamermm/trunk/gstreamerbase/gstreamerbasemm.h	Mon Dec  1 02:39:27 2008
@@ -1,8 +1,7 @@
 #ifndef _GSTREAMERBASEMM_H_
 #define _GSTREAMERBASEMM_H_
 
-//#include <gstreamerbasemm/bin.h>
-
+// Base includes
 #include <gstreamerbasemm/init.h>
 #include <gstreamerbasemm/wrap_init.h>
 #include <gstreamerbasemm/audioclock.h>