[gstreamermm: 65/167] made project build-able



commit dd2520b3c2b83805865bd28cbff8c7fbd0b70133
Author: Marcin Kolny at Flytronic <marcin kolny flytronic pl>
Date:   Mon Jul 29 14:01:14 2013 +0200

    made project build-able

 examples/Makefile.am          |    5 -----
 gstreamer/gstreamermm.h       |   35 +----------------------------------
 gstreamer/src/audioformat.ccg |   13 -------------
 gstreamer/src/audioformat.hg  |   14 --------------
 gstreamer/src/audioinfo.hg    |    6 ++----
 gstreamer/src/filelist.am     |   10 ++--------
 gstreamer/src/message.ccg     |    1 -
 7 files changed, 5 insertions(+), 79 deletions(-)
---
diff --git a/examples/Makefile.am b/examples/Makefile.am
index c2fcc1a..ed834cc 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -24,11 +24,6 @@ examples_cppflags = $(GSTREAMERMM_CFLAGS)
 endif
 
 noinst_PROGRAMS =                      \
-       element_link/example            \
-       hello_world/example             \
-       ogg_player/example              \
-       optiongroup/example             \
-       typefind/example                \
        $(optional_examples)
 
 gstreamermm_includes = -I$(top_builddir)/gstreamer $(if $(srcdir:.=),-I$(top_srcdir)/gstreamer)
diff --git a/gstreamer/gstreamermm.h b/gstreamer/gstreamermm.h
index 81fe373..158d034 100644
--- a/gstreamer/gstreamermm.h
+++ b/gstreamer/gstreamermm.h
@@ -74,10 +74,8 @@
 #include <gstreamermm/enums.h>
 #include <gstreamermm/error.h>
 #include <gstreamermm/event.h>
-#include <gstreamermm/filter.h>
 #include <gstreamermm/format.h>
 #include <gstreamermm/ghostpad.h>
-#include <gstreamermm/interface.h>
 #include <gstreamermm/iterator.h>
 #include <gstreamermm/message.h>
 #include <gstreamermm/object.h>
@@ -121,15 +119,8 @@
 #include <gstreamermm/videosink.h>
 
 // Base inteface includes
-#include <gstreamermm/colorbalance.h>
-#include <gstreamermm/colorbalancechannel.h>
-#include <gstreamermm/mixer.h>
-#include <gstreamermm/mixeroptions.h>
-#include <gstreamermm/mixertrack.h>
 #include <gstreamermm/navigation.h>
-#include <gstreamermm/streamvolume.h>
 #include <gstreamermm/videoorientation.h>
-#include <gstreamermm/xoverlay.h>
 
 // Plug-in core includes
 #include <gstreamermm/capsfilter.h>
@@ -144,8 +135,6 @@
 #include <gstreamermm/multiqueue.h>
 #include <gstreamermm/queue.h>
 #include <gstreamermm/queue2.h>
-#include <gstreamermm/tee.h>
-#include <gstreamermm/valve.h>
 
 // Plug-in base includes
 #include <gstreamermm/adder.h>
@@ -164,31 +153,9 @@
 #include <gstreamermm/giostreamsrc.h>
 //TODO? (Add plug-in first): #include <gstreamermm/gnomevfssink.h>
 //TODO? (Add plug-in first): #include <gstreamermm/gnomevfssrc.h>
-#include <gstreamermm/multifdsink.h>
 #include <gstreamermm/oggdemux.h>
 #include <gstreamermm/oggmux.h>
-#include <gstreamermm/playbin.h>
 #include <gstreamermm/subtitleoverlay.h>
-#include <gstreamermm/tcpclientsrc.h>
-#include <gstreamermm/tcpclientsink.h>
-#include <gstreamermm/tcpserversrc.h>
-#include <gstreamermm/tcpserversink.h>
-#include <gstreamermm/textoverlay.h>
-#include <gstreamermm/textrender.h>
-#include <gstreamermm/theoradec.h>
-#include <gstreamermm/theoraenc.h>
-#include <gstreamermm/theoraparse.h>
-#include <gstreamermm/timeoverlay.h>
-#include <gstreamermm/uridecodebin.h>
-#include <gstreamermm/videorate.h>
-#include <gstreamermm/videoscale.h>
-#include <gstreamermm/videotestsrc.h>
-#include <gstreamermm/volume.h>
-#include <gstreamermm/vorbisdec.h>
-#include <gstreamermm/vorbisenc.h>
-#include <gstreamermm/vorbisparse.h>
-#include <gstreamermm/vorbistag.h>
-#include <gstreamermm/ximagesink.h>
-#include <gstreamermm/xvimagesink.h>
+
 
 #endif // _GSTREAMERMM_H
diff --git a/gstreamer/src/audioformat.ccg b/gstreamer/src/audioformat.ccg
index 1d6f9ef..467294e 100644
--- a/gstreamer/src/audioformat.ccg
+++ b/gstreamer/src/audioformat.ccg
@@ -22,17 +22,4 @@
 namespace Gst
 {
 
-AudioFormatInfo::AudioFormatInfo()
-: m_info(g_try_new(GstAudioFormatInfo, 1)),
-  take_ownership(true)
-{
-  // Handle possible memory allocation failure.
-  if(!m_info)
-  {
-    gstreamermm_handle_error(
-      "Failed to allocate a new Gst::AudioFormatInfo.");
-    return;
-  }
-}
-
 }
diff --git a/gstreamer/src/audioformat.hg b/gstreamer/src/audioformat.hg
index 2d657af..bd4d872 100644
--- a/gstreamer/src/audioformat.hg
+++ b/gstreamer/src/audioformat.hg
@@ -37,20 +37,6 @@ public:
     /**
      * Defualt constructor.
      */
-  AudioFormatInfo();
-
-  AudioFormatInfo(Gst::AudioFormat format = Gst::AUDIO_FORMAT_UNKNOWN,
-    std::string name = "", std::string description = "",
-    Gst::AudioFormatFlags flags = Gst::AUDIO_FORMAT_FLAG_INTEGER,
-    gint endianness = 0, gint width = 0, gint depth = 0);
-
-  explicit AudioFormatInfo(GstAudioFormatInfo& castitem,
-    bool take_ownership = false);
-
-  AudioFormatInfo(const AudioFormatInfo& other);
-
-  AudioFormatInfo& operator=(const AudioFormatInfo& other);
-
   virtual ~AudioFormatInfo();
 
   /// Gets the underlying gobject.
diff --git a/gstreamer/src/audioinfo.hg b/gstreamer/src/audioinfo.hg
index d2c2626..c12b72b 100644
--- a/gstreamer/src/audioinfo.hg
+++ b/gstreamer/src/audioinfo.hg
@@ -35,12 +35,10 @@ class AudioInfo : public Gst::AudioFormatInfo
 {
     _CLASS_GENERIC(AudioInfo, GstAudioInfo)
 public:
-  explicit AudioInfo(const GstAudioInfo& castitem,
-    bool take_ownership = false);
 
-  AudioInfo(const AudioInfo& other);
 
-  virtual ~AudioInfo();
+
+  virtual ~AudioInfo(){}
 
   /// Gets the underlying gobject.
   GstAudioInfo* gobj() { return m_info; };
diff --git a/gstreamer/src/filelist.am b/gstreamer/src/filelist.am
index 9b33151..8e656c3 100644
--- a/gstreamer/src/filelist.am
+++ b/gstreamer/src/filelist.am
@@ -26,8 +26,8 @@ plugins_hg =                    \
         adder.hg                \
         alsasink.hg             \
         alsasrc.hg              \
-        appsink.hg              \
         appsrc.hg               \
+        appsink.hg              \
         audioconvert.hg         \
         audiorate.hg            \
         audioresample.hg        \
@@ -48,17 +48,14 @@ plugins_hg =                    \
         giostreamsink.hg        \
         giostreamsrc.hg         \
         identity.hg             \
-        multifdsink.hg          \
         multiqueue.hg           \
         oggdemux.hg             \
         oggmux.hg               \
-        playbin.hg              \
         queue.hg                \
         queue2.hg               \
         subtitleoverlay.hg      \
         tcpclientsink.hg        \
         tcpclientsrc.hg         \
-        tcpserversink.hg        \
         tcpserversrc.hg         \
         tee.hg                  \
         textoverlay.hg          \
@@ -73,13 +70,11 @@ plugins_hg =                    \
         videorate.hg            \
         videoscale.hg           \
         videotestsrc.hg         \
-        volume.hg               \
         vorbisdec.hg            \
         vorbisenc.hg            \
         vorbisparse.hg          \
         vorbistag.hg            \
-        ximagesink.hg           \
-        xvimagesink.hg
+        ximagesink.hg           
 
 plugins_ccg = $(plugins_hg:.hg=.ccg)
 
@@ -87,7 +82,6 @@ files_hg  =                     \
         audiobasesink.hg        \
         audiobasesrc.hg         \
         audioclock.hg           \
-        audiofilter.hg          \
         audioformat.hg          \
         audioinfo.hg            \
         audioringbuffer.hg      \
diff --git a/gstreamer/src/message.ccg b/gstreamer/src/message.ccg
index 51a2b38..032f780 100644
--- a/gstreamer/src/message.ccg
+++ b/gstreamer/src/message.ccg
@@ -19,7 +19,6 @@
 
 #include <gst/gst.h>
 #include <gstreamermm/element.h>
-#include <gstreamermm/mixer.h>
 #include <gstreamermm/pad.h>
 #include <gstreamermm/structure.h>
 #include <gstreamermm/taglist.h>


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