[gstreamermm: 119/167] fixed and enabled playbin, repaired hello_world example
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gstreamermm: 119/167] fixed and enabled playbin, repaired hello_world example
- Date: Tue, 3 Sep 2013 19:29:04 +0000 (UTC)
commit b7dca89bafcec9320b902a982aa68462de637c1e
Author: Marcin Kolny [loganek] <marcin kolny gmail com>
Date: Fri Aug 2 02:21:21 2013 +0200
fixed and enabled playbin, repaired hello_world example
examples/Makefile.am | 1 +
examples/hello_world/main.cc | 5 +++--
gstreamer/src/colorbalance.hg | 4 ++--
gstreamer/src/filelist.am | 4 ++++
gstreamer/src/streamvolume.hg | 2 +-
5 files changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/examples/Makefile.am b/examples/Makefile.am
index b5f5a81..40fa86d 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -25,6 +25,7 @@ endif
noinst_PROGRAMS = \
element_link/example \
+ hello_world/example \
ogg_player/example \
ogg_rewriter/example \
optiongroup/example \
diff --git a/examples/hello_world/main.cc b/examples/hello_world/main.cc
index af765b6..ead1d6e 100644
--- a/examples/hello_world/main.cc
+++ b/examples/hello_world/main.cc
@@ -20,6 +20,7 @@
#include <glibmm.h>
#include <iostream>
#include <stdlib.h>
+#include <gstreamermm/playbin.h>
namespace
{
@@ -38,7 +39,7 @@ bool on_bus_message(const Glib::RefPtr<Gst::Bus>& /* bus */,
case Gst::MESSAGE_ERROR:
{
Glib::RefPtr<Gst::MessageError> msgError =
- Glib::RefPtr<Gst::MessageError>::cast_dynamic(message);
+ Glib::RefPtr<Gst::MessageError>::cast_static(message);
if(msgError)
{
@@ -74,7 +75,7 @@ int main(int argc, char** argv)
}
// Create a playbin2 element.
- Glib::RefPtr<Gst::PlayBin2> playbin = Gst::PlayBin2::create();
+ Glib::RefPtr<Gst::PlayBin> playbin = Gst::PlayBin::create();
if(!playbin)
{
diff --git a/gstreamer/src/colorbalance.hg b/gstreamer/src/colorbalance.hg
index ef6a630..518d382 100644
--- a/gstreamer/src/colorbalance.hg
+++ b/gstreamer/src/colorbalance.hg
@@ -25,7 +25,7 @@ _DEFS(gstreamermm,gst)
namespace Gst
{
-_WRAP_ENUM(ColorBalanceType, GstColorBalanceType)
+_WRAP_ENUM(ColorBalanceType, GstColorBalanceType, NO_GTYPE)
class ColorBalanceChannel;
@@ -34,7 +34,7 @@ class ColorBalanceChannel;
*/
class ColorBalance : public Glib::Interface
{
- _CLASS_INTERFACE(ColorBalance, GstColorBalance, GST_COLOR_BALANCE, GstColorBalanceClass)
+ _CLASS_INTERFACE(ColorBalance, GstColorBalance, GST_COLOR_BALANCE, GstColorBalanceInterface)
public:
#m4 _CONVERSION(`const GList*', `Glib::ListHandle< Glib::RefPtr<ColorBalanceChannel> >',
`$2(const_cast<GList*>($3), Glib::OWNERSHIP_NONE)')
diff --git a/gstreamer/src/filelist.am b/gstreamer/src/filelist.am
index 9a71c13..1f82d5f 100644
--- a/gstreamer/src/filelist.am
+++ b/gstreamer/src/filelist.am
@@ -51,6 +51,7 @@ plugins_hg = \
multiqueue.hg \
oggdemux.hg \
oggmux.hg \
+ playbin.hg \
queue.hg \
queue2.hg \
subtitleoverlay.hg \
@@ -98,6 +99,8 @@ files_hg = \
caps.hg \
childproxy.hg \
clock.hg \
+ colorbalance.hg \
+ colorbalancechannel.hg \
discoverer.hg \
discovererinfo.hg \
elementfactory.hg \
@@ -126,6 +129,7 @@ files_hg = \
registry.hg \
sample.hg \
segment.hg \
+ streamvolume.hg \
structure.hg \
systemclock.hg \
taglist.hg \
diff --git a/gstreamer/src/streamvolume.hg b/gstreamer/src/streamvolume.hg
index 865d551..8788d55 100644
--- a/gstreamer/src/streamvolume.hg
+++ b/gstreamer/src/streamvolume.hg
@@ -25,7 +25,7 @@ _DEFS(gstreamermm,gst)
namespace Gst
{
-_WRAP_ENUM(StreamVolumeFormat, GstStreamVolumeFormat)
+_WRAP_ENUM(StreamVolumeFormat, GstStreamVolumeFormat, NO_GTYPE)
/** An interface for elements that provide a stream volume.
* @ingroup GstInterfaces
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]