Fix music not properly fading in again

[supertux.git] / src / audio / sound_file.hpp

diff --git a/src/audio/sound_file.hpp b/src/audio/sound_file.hpp
index 81184b1..5a84cff 100644 (file)
--- a/src/audio/sound_file.hpp
+++ b/src/audio/sound_file.hpp
@@ -1,12 +1,35 @@
-#ifndef __SOUND_FILE_H__
-#define __SOUND_FILE_H__
+//  SuperTux
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program 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 General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef HEADER_SUPERTUX_AUDIO_SOUND_FILE_HPP
+#define HEADER_SUPERTUX_AUDIO_SOUND_FILE_HPP
 
-#include <stdio.h>
 #include <iostream>
+#include <memory>
 
 class SoundFile
 {
 public:
+  SoundFile() :
+    channels(),
+    rate(),
+    bits_per_sample(),
+    size()
+  {}
+
   virtual ~SoundFile()
   { }
 
@@ -18,9 +41,14 @@ public:
   int bits_per_sample;
   /// size in bytes
   size_t size;
+
+private:
+  SoundFile(const SoundFile&) = delete;
+  SoundFile& operator=(const SoundFile&) = delete;
 };
 
-SoundFile* load_sound_file(const std::string& filename);
+std::unique_ptr<SoundFile> load_sound_file(const std::string& filename);
 
 #endif
 
+/* EOF */