]> granicus.if.org Git - taglib/commitdiff
Add a skeleton (unimplemented) AIFF properties class.
authorScott Wheeler <wheeler@kde.org>
Fri, 16 May 2008 07:09:20 +0000 (07:09 +0000)
committerScott Wheeler <wheeler@kde.org>
Fri, 16 May 2008 07:09:20 +0000 (07:09 +0000)
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@808255 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

taglib/CMakeLists.txt
taglib/riff/aiff/CMakeLists.txt
taglib/riff/aiff/Makefile.am
taglib/riff/aiff/aifffile.h
taglib/riff/aiff/aiffproperties.cpp [new file with mode: 0644]
taglib/riff/aiff/aiffproperties.h [new file with mode: 0644]

index 6e0970e0c1a45c807a2404d42db3f0d8fa4bf3c5..73347e01d6056b3abeb8508f5a306edd0d22499b 100644 (file)
@@ -125,6 +125,7 @@ riff/rifffile.cpp
 
 SET(aiff_SRCS
 riff/aiff/aifffile.cpp
+riff/aiff/aiffproperties.cpp
 )
 
 SET(toolkit_SRCS
index 463cbe437f13b0a229d59962d46118d61f57c80f..7e8cdd666bb65dee49b900bf615744007682608c 100644 (file)
@@ -1 +1 @@
-INSTALL( FILES  aifffile.h DESTINATION ${INCLUDE_INSTALL_DIR}/taglib)
+INSTALL( FILES  aifffile.h aiffproperties.h DESTINATION ${INCLUDE_INSTALL_DIR}/taglib)
index c465245ca7e493e0ba42fbbe85883350a328cd99..dff13a5a16ba323b70f10811c6161fc563df54b4 100644 (file)
@@ -7,7 +7,7 @@ INCLUDES = \
 
 noinst_LTLIBRARIES = libaiff.la
 
-libaiff_la_SOURCES = aifffile.cpp
+libaiff_la_SOURCES = aifffile.cpp aiffproperties.cpp
 
-taglib_include_HEADERS = aifffile.h
+taglib_include_HEADERS = aifffile.h aiffproperties.h
 taglib_includedir = $(includedir)/taglib
index f81b4a15a190e023c1cad2eab9b95a9353a5ec6e..d2408c1296fb2f7a39d1b0674ec67d4f019f798d 100644 (file)
@@ -26,9 +26,9 @@
 #ifndef TAGLIB_AIFFFILE_H
 #define TAGLIB_AIFFFILE_H
 
-#include <rifffile.h>
-#include <id3v2tag.h>
-#include <audioproperties.h>
+#include "rifffile.h"
+#include "id3v2tag.h"
+#include "aiffproperties.h"
 
 namespace TagLib {
 
@@ -47,8 +47,6 @@ namespace TagLib {
 
     namespace AIFF {
 
-      class Properties : public AudioProperties {};
-
       //! An implementation of TagLib::File with AIFF specific methods
 
       /*!
diff --git a/taglib/riff/aiff/aiffproperties.cpp b/taglib/riff/aiff/aiffproperties.cpp
new file mode 100644 (file)
index 0000000..dd4a524
--- /dev/null
@@ -0,0 +1,95 @@
+/***************************************************************************
+    copyright            : (C) 2008 by Scott Wheeler
+    email                : wheeler@kde.org
+ ***************************************************************************/
+
+/***************************************************************************
+ *   This library is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU Lesser General Public License version   *
+ *   2.1 as published by the Free Software Foundation.                     *
+ *                                                                         *
+ *   This library is distributed in the hope that it will be useful, but   *
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
+ *   Lesser General Public License for more details.                       *
+ *                                                                         *
+ *   You should have received a copy of the GNU Lesser General Public      *
+ *   License along with this library; if not, write to the Free Software   *
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  *
+ *   USA                                                                   *
+ *                                                                         *
+ *   Alternatively, this file is available under the Mozilla Public        *
+ *   License Version 1.1.  You may obtain a copy of the License at         *
+ *   http://www.mozilla.org/MPL/                                           *
+ ***************************************************************************/
+
+#include <tstring.h>
+#include <tdebug.h>
+#include <bitset>
+
+#include "aiffproperties.h"
+
+using namespace TagLib;
+
+class RIFF::AIFF::Properties::PropertiesPrivate
+{
+public:
+  PropertiesPrivate() :
+    length(0),
+    bitrate(0),
+    sampleRate(0),
+    channels(0)
+  {
+
+  }
+
+  int length;
+  int bitrate;
+  int sampleRate;
+  int channels;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// public members
+////////////////////////////////////////////////////////////////////////////////
+
+RIFF::AIFF::Properties::Properties(const ByteVector &data, ReadStyle style) : AudioProperties(style)
+{
+  d = new PropertiesPrivate;
+  read(data);
+}
+
+RIFF::AIFF::Properties::~Properties()
+{
+  delete d;
+}
+
+int RIFF::AIFF::Properties::length() const
+{
+  return d->length;
+}
+
+int RIFF::AIFF::Properties::bitrate() const
+{
+  return d->bitrate;
+}
+
+int RIFF::AIFF::Properties::sampleRate() const
+{
+  return d->sampleRate;
+}
+
+int RIFF::AIFF::Properties::channels() const
+{
+  return d->channels;
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// private members
+////////////////////////////////////////////////////////////////////////////////
+
+void RIFF::AIFF::Properties::read(const ByteVector &data)
+{
+
+}
diff --git a/taglib/riff/aiff/aiffproperties.h b/taglib/riff/aiff/aiffproperties.h
new file mode 100644 (file)
index 0000000..1408cb3
--- /dev/null
@@ -0,0 +1,80 @@
+/***************************************************************************
+    copyright            : (C) 2008 by Scott Wheeler
+    email                : wheeler@kde.org
+***************************************************************************/
+
+/***************************************************************************
+ *   This library is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU Lesser General Public License version   *
+ *   2.1 as published by the Free Software Foundation.                     *
+ *                                                                         *
+ *   This library is distributed in the hope that it will be useful, but   *
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
+ *   Lesser General Public License for more details.                       *
+ *                                                                         *
+ *   You should have received a copy of the GNU Lesser General Public      *
+ *   License along with this library; if not, write to the Free Software   *
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  *
+ *   USA                                                                   *
+ *                                                                         *
+ *   Alternatively, this file is available under the Mozilla Public        *
+ *   License Version 1.1.  You may obtain a copy of the License at         *
+ *   http://www.mozilla.org/MPL/                                           *
+ ***************************************************************************/
+
+#ifndef TAGLIB_AIFFPROPERTIES_H
+#define TAGLIB_AIFFPROPERTIES_H
+
+#include "audioproperties.h"
+
+namespace TagLib {
+
+  namespace RIFF {
+
+    namespace AIFF {
+
+      class File;
+
+      //! An implementation of audio property reading for AIFF
+
+      /*!
+       * This reads the data from an AIFF stream found in the AudioProperties
+       * API.
+       */
+
+      class TAGLIB_EXPORT Properties : public AudioProperties
+      {
+      public:
+       /*!
+        * Create an instance of AIFF::Properties with the data read from the
+        * ByteVector \a data.
+        */
+       Properties(const ByteVector &data, ReadStyle style);
+
+       /*!
+        * Destroys this AIFF::Properties instance.
+        */
+       virtual ~Properties();
+
+       // Reimplementations.
+
+       virtual int length() const;
+       virtual int bitrate() const;
+       virtual int sampleRate() const;
+       virtual int channels() const;
+
+      private:
+       Properties(const Properties &);
+       Properties &operator=(const Properties &);
+
+       void read(const ByteVector &data);
+
+       class PropertiesPrivate;
+       PropertiesPrivate *d;
+      };
+    }
+  }
+}
+
+#endif