<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -12,23 +12,61 @@
 #define __ze_zmusic_h__
 
 #include &quot;ZE_ZEngine.h&quot;
-#include &quot;ZE_ZSoundBase.h&quot;
-
-#ifdef USE_AUDIERE
+#include &quot;ZE_ZAudioBase.h&quot;
 
 namespace ZE
 {
 
-class ZMusic : public ZSoundBase
+#if SND_BACKEND == ZE_MIXER
+
+class ZMusic
 {
+    protected:
+        ZEngine* rEngine;
+        Mix_Music *rMusic;
     public:
+        static const int LoopInfinite;
+        
         ZMusic();
         ZMusic(std::string filename);
+        virtual ~ZMusic();
+        
         void Open(std::string filename);
+        //void OpenFromZip(std::string zipname, std::string filename);
+        void OpenFromZRF(std::string resourceId);
+        void Release();
+
+        void Play(int loopNum=0, int fadeTime=0) const;
+        void Pause() const;
+        void Unpause() const;
+        void Rewind() const;
+        void Stop(int fadeTime=0) const;
+
+        void SetVolume(int volume);
+        void SetPosition(int position);
+
+        bool IsLoaded() const;
+        bool IsPlaying() const;
+        bool IsPaused() const;
+        bool IsSeekable() const;
+        int GetVolume() const;
 };
 
-}
+#elif SND_BACKEND == ZE_AUDIERE
+
+class ZMusic : public ZAudioBase
+{
+    public:
+        ZMusic();
+        ZMusic(std::string filename);
+
+        void Open(std::string filename);
+        void OpenFromZip(std::string zipname, std::string filename);
+        void OpenFromZRF(std::string resourceId);
+};
 
-#endif //USE_AUDIERE
+#endif //SND_BACKEND
+
+}
 
 #endif //__ze_zmusic_h__</diff>
      <filename>include/ZE_ZMusic.h</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>dcd715832d7250b70ce9021857885250bb3b6699</id>
    </parent>
  </parents>
  <author>
    <name>James Turk</name>
    <email>james.p.turk@gmail.com</email>
  </author>
  <url>http://github.com/jamesturk/zengine/commit/d35401d69c91ea11f182337b15c2c92529f509dc</url>
  <id>d35401d69c91ea11f182337b15c2c92529f509dc</id>
  <committed-date>2004-01-13T15:59:32-08:00</committed-date>
  <authored-date>2004-01-13T15:59:32-08:00</authored-date>
  <message>planning split</message>
  <tree>dc9ce86c4eab908ee6ca645c32f0f9fe90254d6b</tree>
  <committer>
    <name>James Turk</name>
    <email>james.p.turk@gmail.com</email>
  </committer>
</commit>
