X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Faudiocontainer.cpp;h=70d5dd98e1ea2f88b35f51b60386b1eb3be2aac0;hb=756c0d29ac1742f231e6615f9a577e574e35a4af;hp=5640ac4ced65853648a18e9156b964750c2fdd73;hpb=c3ad95144d148602f672e95ddda1f18fc35502f8;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/audiocontainer.cpp b/synfig-studio/trunk/src/gtkmm/audiocontainer.cpp
index 5640ac4..70d5dd9 100644
--- a/synfig-studio/trunk/src/gtkmm/audiocontainer.cpp
+++ b/synfig-studio/trunk/src/gtkmm/audiocontainer.cpp
@@ -54,6 +54,8 @@
 #include <fmod.h>
 #endif
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -851,7 +853,7 @@ studio::AudioContainer::~AudioContainer()
 	if(imp) delete (imp);
 }
 
-bool studio::AudioContainer::load(const string &filename,const string &filedirectory)
+bool studio::AudioContainer::load(const std::string &filename,const std::string &filedirectory)
 {
 	if(!imp)
 	{
@@ -1187,9 +1189,9 @@ void studio::AudioContainer::AudioImp::clear()
 }
 
 #ifdef WITH_FMOD
-void AudioContainer::AudioImp::start_scrubbing(double t)
+void studio::AudioContainer::AudioImp::start_scrubbing(double t)
 #else
-void AudioContainer::AudioImp::start_scrubbing(double /*t*/)
+void studio::AudioContainer::AudioImp::start_scrubbing(double /*t*/)
 #endif
 {
 	//synfig::info("Start scrubbing: %lf", t);
@@ -1241,7 +1243,7 @@ void AudioContainer::AudioImp::start_scrubbing(double /*t*/)
 	#endif
 }
 
-void AudioContainer::AudioImp::stop_scrubbing()
+void studio::AudioContainer::AudioImp::stop_scrubbing()
 {
 	//synfig::info("Stop scrubbing");
 
@@ -1263,9 +1265,9 @@ void AudioContainer::AudioImp::stop_scrubbing()
 }
 
 #ifdef WITH_FMOD
-void AudioContainer::AudioImp::scrub(double t)
+void studio::AudioContainer::AudioImp::scrub(double t)
 #else
-void AudioContainer::AudioImp::scrub(double /*t*/)
+void studio::AudioContainer::AudioImp::scrub(double /*t*/)
 #endif
 {
 	#ifdef WITH_FMOD
@@ -1284,7 +1286,7 @@ void AudioContainer::AudioImp::scrub(double /*t*/)
 
 		curscrubpos = newpos;
 
-		//Ok the sound is running, now we need to tweek it
+		//Ok the sound is running, now we need to tweak it
 		if(newpos > oldpos)
 		{
 			//Outside so completely stopped...