summaryrefslogtreecommitdiffstats
path: root/src/sound/sound.h
diff options
context:
space:
mode:
authorPiotr Dziwiński <piotrdz@gmail.com>2012-08-12 10:15:19 -0700
committerPiotr Dziwiński <piotrdz@gmail.com>2012-08-12 10:15:19 -0700
commit50deedb6cbc927f6c7d6c3c5e9134d11c20782ae (patch)
tree8eb3fbd914cfea11660534b296bfddcffcc5f7b4 /src/sound/sound.h
parentbc24b9f9e516e657fcc0034808e010287fc2e393 (diff)
parent62b545128f37746c343760e464872655b5523c6f (diff)
downloadcolobot-50deedb6cbc927f6c7d6c3c5e9134d11c20782ae.tar.gz
colobot-50deedb6cbc927f6c7d6c3c5e9134d11c20782ae.tar.bz2
colobot-50deedb6cbc927f6c7d6c3c5e9134d11c20782ae.zip
Merge pull request #36 from Erihel/dev
Merge of new features: plugins and INI profile, changes from dev-graphics
Diffstat (limited to 'src/sound/sound.h')
-rw-r--r--src/sound/sound.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/sound/sound.h b/src/sound/sound.h
index a1b8fe3..45ec7e1 100644
--- a/src/sound/sound.h
+++ b/src/sound/sound.h
@@ -15,10 +15,10 @@
// * You should have received a copy of the GNU General Public License
// * along with this program. If not, see http://www.gnu.org/licenses/.
-// soundinterface.h
+// sound.h
/**
- * @file sound/soundinterface.h
+ * @file sound/sound.h
* @brief Sound plugin interface
*/
@@ -26,7 +26,7 @@
#include <math/vector.h>
-#include <plugins/plugin.h>
+#include <plugins/plugininterface.h>
#include <string>
@@ -39,7 +39,7 @@
/**
* \public
- * \enum Sound sound/soundinterface.h
+ * \enum Sound sound/sound.h
* \brief Sound enum representing sound file
**/
enum Sound
@@ -131,7 +131,7 @@ enum Sound
/**
* \public
- * \enum SoundNext sound/soundinterface.h
+ * \enum SoundNext sound/sound.h
* \brief Enum representing operation that will be performend on a sound at given time
**/
enum SoundNext
@@ -148,7 +148,7 @@ enum SoundNext
* @brief Sound plugin interface
*
*/
-class CSoundInterface : public CPlugin
+class CSoundInterface : public CPluginInterface
{
public:
CSoundInterface() {
@@ -319,3 +319,4 @@ class CSoundInterface : public CPlugin
*/
virtual bool IsPlayingMusic() = 0;
};
+