[gstreamermm: 55/167] minor fixes, temporary disabled streamvolume class



commit 6137810135a6d32b072a711612c51553ae702799
Author: Marcin Kolny at Flytronic <marcin kolny flytronic pl>
Date:   Fri Jul 26 14:14:40 2013 +0200

    minor fixes, temporary disabled streamvolume class

 gstreamer/src/event.hg        |    5 ++++-
 gstreamer/src/filelist.am     |    1 -
 gstreamer/src/registry.hg     |   10 ----------
 gstreamer/src/segment.ccg     |    2 +-
 gstreamer/src/segment.hg      |    5 +----
 gstreamer/src/streamvolume.hg |    2 +-
 6 files changed, 7 insertions(+), 18 deletions(-)
---
diff --git a/gstreamer/src/event.hg b/gstreamer/src/event.hg
index a17cfb7..ce22748 100644
--- a/gstreamer/src/event.hg
+++ b/gstreamer/src/event.hg
@@ -21,13 +21,16 @@
 #include <gstreamermm/miniobject.h>
 #include <gstreamermm/format.h>
 #include <gstreamermm/clock.h>
-#include <gstreamermm/segment.h>
+
 
 _DEFS(gstreamermm,gst)
 
 namespace Gst
 {
 
+  _WRAP_ENUM(SeekType, GstSeekType)
+  _WRAP_ENUM(SeekFlags, GstSeekFlags)
+
 _WRAP_ENUM_DOCS_ONLY(EventType, GstEventType)
 /* this enum must be wrapped manually since automatic generator (enum.pl) doesn't handle commas properly*/
 enum EventType
diff --git a/gstreamer/src/filelist.am b/gstreamer/src/filelist.am
index fa43405..7f1bcf7 100644
--- a/gstreamer/src/filelist.am
+++ b/gstreamer/src/filelist.am
@@ -128,7 +128,6 @@ files_hg  =                     \
         query.hg                \
         registry.hg             \
         segment.hg              \
-        streamvolume.hg         \
         structure.hg            \
         systemclock.hg          \
         taglist.hg              \
diff --git a/gstreamer/src/registry.hg b/gstreamer/src/registry.hg
index 3777d40..b9cf4e0 100644
--- a/gstreamer/src/registry.hg
+++ b/gstreamer/src/registry.hg
@@ -106,9 +106,6 @@ public:
   _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() 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)
 
@@ -170,7 +167,6 @@ public:
   _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)
 
   _WRAP_METHOD(Glib::RefPtr<Gst::Plugin> lookup(const Glib::ustring& filename), gst_registry_lookup)
@@ -178,12 +174,6 @@ public:
   _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)
-
-#m4 _CONVERSION(`GstPluginFeature*',`const Glib::RefPtr<Gst::PluginFeature>&',`Glib::wrap($3, true)')
-  _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)')
-  _WRAP_SIGNAL(void plugin_added(const Glib::RefPtr<Gst::Plugin>& plugin), "plugin-added")
 };
 
 } // namespace Gst
diff --git a/gstreamer/src/segment.ccg b/gstreamer/src/segment.ccg
index 7b74fe4..65032a5 100644
--- a/gstreamer/src/segment.ccg
+++ b/gstreamer/src/segment.ccg
@@ -28,7 +28,7 @@ void Segment::set_seek(double rate, Format format, SeekFlags flags,
 {
   gboolean gst_update = 0;
 
-  gst_segment_set_seek(gobj(), rate, static_cast<GstFormat>(format),
+  gst_segment_do_seek(gobj(), rate, static_cast<GstFormat>(format),
     static_cast<GstSeekFlags>(flags), static_cast<GstSeekType>(start_type),
     start, static_cast<GstSeekType>(stop_type), stop, &gst_update); 
 
diff --git a/gstreamer/src/segment.hg b/gstreamer/src/segment.hg
index 8cb47bd..5a5662b 100644
--- a/gstreamer/src/segment.hg
+++ b/gstreamer/src/segment.hg
@@ -26,9 +26,6 @@ _DEFS(gstreamermm,gst)
 namespace Gst
 {
 
-  _WRAP_ENUM(SeekType, GstSeekType)
-  _WRAP_ENUM(SeekFlags, GstSeekFlags)
-
 /** A class that describes the configured region of interest in a media file.
  * This helper structure holds the relevant values for tracking the region of
  * interest in a media file, called a segment.
@@ -96,7 +93,7 @@ public:
   _WRAP_METHOD(void set_newsegment(bool update, double rate, Format format, guint64 start, guint64 stop, 
guint64 time), gst_segment_set_newsegment)
   _WRAP_METHOD(void set_newsegment(bool update, double rate, double applied_rate, Format format, guint64 
start, guint64 stop, guint64 time), gst_segment_set_newsegment_full)
   _WRAP_METHOD_DOCS_ONLY(gst_segment_set_seek)
-  void set_seek(double rate, Format format, SeekFlags flags, SeekType start_type, guint64 start, SeekType 
stop_type, guint64 stop, bool& update);
+  void set_seek(double rate, Format format, SeekFlags flags, SeekType start_type, gint64 start, SeekType 
stop_type, gint64 stop, bool& update);
   _WRAP_METHOD(guint64 to_running_time(Format format, guint64 position) const, gst_segment_to_running_time)
   _WRAP_METHOD(guint64 to_stream_time(Format format, guint64 position) const, gst_segment_to_stream_time)
   _WRAP_METHOD(guint64 to_position(Format format, guint64 running_time) const, gst_segment_to_position)
diff --git a/gstreamer/src/streamvolume.hg b/gstreamer/src/streamvolume.hg
index eca6cf1..865d551 100644
--- a/gstreamer/src/streamvolume.hg
+++ b/gstreamer/src/streamvolume.hg
@@ -17,7 +17,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gst/interfaces/streamvolume.h>
+#include <gst/audio/streamvolume.h>
 #include <glibmm/interface.h>
 
 _DEFS(gstreamermm,gst)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]