[gstreamermm] audio: don't use deprecated auto_ptr



commit 9d1574035f9d23a1fa235af95f8fe7ac49a9420a
Author: Marcin Kolny <marcin kolny gmail com>
Date:   Thu Oct 15 19:02:51 2015 +0200

    audio: don't use deprecated auto_ptr
    
        * gstreamer/src/audiobasesrc.{ccg|hg}:
        * gstreamer/src/audioclock.hg:
        * gstreamer/src/audioringbuffer.{ccg|hg}: auto_ptr class has been
          deprecated since C++11, so we're replacing it with std::unique_ptr.

 gstreamer/src/audiobasesrc.ccg    |    4 +---
 gstreamer/src/audiobasesrc.hg     |    5 ++---
 gstreamer/src/audioclock.hg       |    9 +++++++--
 gstreamer/src/audioringbuffer.ccg |    2 +-
 gstreamer/src/audioringbuffer.hg  |    9 +++++++--
 5 files changed, 18 insertions(+), 11 deletions(-)
---
diff --git a/gstreamer/src/audiobasesrc.ccg b/gstreamer/src/audiobasesrc.ccg
index a41f0ea..08bab3b 100644
--- a/gstreamer/src/audiobasesrc.ccg
+++ b/gstreamer/src/audiobasesrc.ccg
@@ -1,6 +1,6 @@
 /* gstreamermm - a C++ wrapper for gstreamer
  *
- * Copyright 2008 The gstreamermm Development Team
+ * Copyright 2008-2015 The gstreamermm Development Team
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -16,5 +16,3 @@
  * License along with this library; if not, write to the Free
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-
-#include <gst/audio/audio.h>
diff --git a/gstreamer/src/audiobasesrc.hg b/gstreamer/src/audiobasesrc.hg
index 8bf6599..4cd430e 100644
--- a/gstreamer/src/audiobasesrc.hg
+++ b/gstreamer/src/audiobasesrc.hg
@@ -1,6 +1,6 @@
 /* gstreamermm - a C++ wrapper for gstreamer
  *
- * Copyright 2008 The gstreamermm Development Team
+ * Copyright 2008-2015 The gstreamermm Development Team
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -17,7 +17,6 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gst/audio/audio.h>
 #include <gst/audio/gstaudiobasesrc.h>
 #include <gstreamermm/pushsrc.h>
 #include <gstreamermm/audioringbuffer.h>
@@ -37,7 +36,7 @@ _WRAP_ENUM(AudioBaseSrcSlaveMethod, GstAudioBaseSrcSlaveMethod)
  * create_ringbuffer_vfunc vmethod. This base class will then take care of
  * reading samples from the audioringbuffer, synchronisation and flushing.
  *
- * Last reviewed on 2006-09-27 (0.10.12).
+ * Last reviewed on 2015-10-15 (1.5.2).
  *
  * @ingroup GstBaseClasses
  */
diff --git a/gstreamer/src/audioclock.hg b/gstreamer/src/audioclock.hg
index 5b85eea..74f0280 100644
--- a/gstreamer/src/audioclock.hg
+++ b/gstreamer/src/audioclock.hg
@@ -32,7 +32,7 @@ namespace Gst
  * This object is internally used to implement the clock in
  * Gst::AudioBaseSink.
  *
- * Last reviewed on 2006-09-27 (0.10.12).
+ * Last reviewed on 2015-10-15 (1.5.2).
  */
 class AudioClock : public Gst::SystemClock
 {
@@ -66,7 +66,12 @@ public:
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 private:
-  std::auto_ptr<SlotGetTime> m_slot;
+  // todo this slot should be moved in move constructor, but for now it's
+  // impossible to provide custom move constructor
+  // (see https://bugzilla.gnome.org/show_bug.cgi?id=756593).
+  // However, task should be managed by RefPtr class, so move constructor
+  // and move assignment operator will never be called.
+  std::unique_ptr<SlotGetTime> m_slot;
 #endif
 };
 
diff --git a/gstreamer/src/audioringbuffer.ccg b/gstreamer/src/audioringbuffer.ccg
index 3af78ed..0943646 100644
--- a/gstreamer/src/audioringbuffer.ccg
+++ b/gstreamer/src/audioringbuffer.ccg
@@ -1,6 +1,6 @@
 /* gstreamermm - a C++ wrapper for gstreamer
  *
- * Copyright 2008-2009 The gstreamermm Development Team
+ * Copyright 2008-2015 The gstreamermm Development Team
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/gstreamer/src/audioringbuffer.hg b/gstreamer/src/audioringbuffer.hg
index d355ca0..8e62e45 100644
--- a/gstreamer/src/audioringbuffer.hg
+++ b/gstreamer/src/audioringbuffer.hg
@@ -1,6 +1,6 @@
 /* gstreamermm - a C++ wrapper for gstreamer
  *
- * Copyright 2008-2009 The gstreamermm Development Team
+ * Copyright 2008-2015 The gstreamermm Development Team
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -303,7 +303,12 @@ protected:
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 private:
-  std::auto_ptr<SlotFill> m_slot;
+  // todo this slot should be moved in move constructor, but for now it's
+  // impossible to provide custom move constructor
+  // (see https://bugzilla.gnome.org/show_bug.cgi?id=756593).
+  // However, task should be managed by RefPtr class, so move constructor
+  // and move assignment operator will never be called.
+  std::unique_ptr<SlotFill> m_slot;
 #endif
 };
 


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