Utilize ImplPtr in AV component (#296)

Signed-off-by: Michael Carroll <[email protected]>

av/include/ignition/common/AudioDecoder.hh

@@ -19,28 +19,21 @@
 
 #include <stdint.h>
 #include <string>
-#include <memory>
 
 #include <ignition/common/av/Export.hh>
-#include <ignition/utils/SuppressWarning.hh>
+#include <ignition/utils/ImplPtr.hh>
 
 namespace ignition
 {
   namespace common
   {
-    /// \brief Forward declaration of private data class
-    class AudioDecoderPrivate;
-
     /// \class AudioDecoder AudioDecoder.hh ignition/common/common.hh
     /// \brief An audio decoder based on FFMPEG.
     class IGNITION_COMMON_AV_VISIBLE AudioDecoder
     {
       /// \brief Constructor.
       public: AudioDecoder();
 
-      /// \brief Destructor.
-      public: virtual ~AudioDecoder();
-
       /// \brief Set the file to decode.
       /// \param[in] _filename Path to an audio file.
       /// \return True if the file was successfull opened.
@@ -63,13 +56,8 @@ namespace ignition
       /// If no file is decoded, -1 is returned.
       public: int SampleRate();
 
-      /// \brief Free audio object, close files, streams.
-      private: void Cleanup();
-
-      IGN_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING
       /// \brief Private data pointer
-      private: std::unique_ptr<AudioDecoderPrivate> data;
-      IGN_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING
+      IGN_UTILS_UNIQUE_IMPL_PTR(dataPtr)
     };
   }
 }

av/include/ignition/common/HWEncoder.hh

@@ -16,22 +16,19 @@
 #ifndef IGNITION_COMMON_HWENCODER_HH
 #define IGNITION_COMMON_HWENCODER_HH
 
-#include <memory>
 #include <string>
 #include <optional>
 
 #include <ignition/common/FlagSet.hh>
 #include <ignition/common/av/Export.hh>
 #include <ignition/common/HWVideo.hh>
 #include <ignition/common/ffmpeg_inc.hh>
+#include <ignition/utils/ImplPtr.hh>
 
 /// This is an internal-use only class encapsulating HW video encoding. All
 /// symbols defined here are hidden from the public API.
 namespace ignition::common
 {
-  // Forward declare private data class
-  class HWVideoPrivate;
-
   /// \brief Representation of a GPU video encoder and its configuration.
   /// \note This class is intentionally hidden as it provides highly customized
   /// behavior tailored just for the use with VideoEncoder.
@@ -81,7 +78,8 @@ namespace ignition::common
     /// The value will be NONE until ConfigHWAccel() successfully finishes.
     public: HWEncoderType GetEncoderType() const;
 
-    private: std::unique_ptr<HWVideoPrivate> dataPtr;
+    /// \brief Private data pointer
+    IGN_UTILS_UNIQUE_IMPL_PTR(dataPtr)
   };
 }
 

av/include/ignition/common/Video.hh

@@ -18,10 +18,9 @@
 #define IGNITION_COMMON_VIDEO_HH_
 
 #include <string>
-#include <memory>
 
 #include <ignition/common/av/Export.hh>
-#include <ignition/utils/SuppressWarning.hh>
+#include <ignition/utils/ImplPtr.hh>
 
 struct AVFormatContext;
 struct AVCodecContext;
@@ -33,9 +32,6 @@ namespace ignition
 {
   namespace common
   {
-    // Forward declare private data class
-    class VideoPrivate;
-
     /// \brief Handle video encoding and decoding using libavcodec
     class IGNITION_COMMON_AV_VISIBLE Video
     {
@@ -76,10 +72,8 @@ namespace ignition
       /// \brief free up open Video object, close files, streams
       private: void Cleanup();
 
-      IGN_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING
       /// \brief Private data pointer
-      private: std::unique_ptr<VideoPrivate> dataPtr;
-      IGN_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING
+      IGN_UTILS_UNIQUE_IMPL_PTR(dataPtr)
     };
   }
 }

av/include/ignition/common/VideoEncoder.hh

@@ -19,13 +19,12 @@
 
 #include <chrono>
 #include <string>
-#include <memory>
 #include <optional>
 
 #include <ignition/common/FlagSet.hh>
 #include <ignition/common/av/Export.hh>
 #include <ignition/common/HWVideo.hh>
-#include <ignition/utils/SuppressWarning.hh>
+#include <ignition/utils/ImplPtr.hh>
 
 // Default bitrate (0) indicates that a bitrate should be calculated when
 // Start is called.
@@ -39,9 +38,6 @@ namespace ignition
 {
   namespace common
   {
-    // Forward declare private data class
-    class VideoEncoderPrivate;
-
     /// \brief The VideoEncoder class supports encoding a series of images
     /// to a video format, and then writing the video to disk.
     class IGNITION_COMMON_AV_VISIBLE VideoEncoder
@@ -221,11 +217,8 @@ namespace ignition
       /// memory. This will also delete any temporary files.
       public: void Reset();
 
-      IGN_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING
-      /// \internal
       /// \brief Private data pointer
-      private: std::unique_ptr<VideoEncoderPrivate> dataPtr;
-      IGN_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING
+      IGN_UTILS_UNIQUE_IMPL_PTR(dataPtr)
     };
   }
 }