projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix some FTBFS issues when compiling with GCC 4.3
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
audiocontainer.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/audiocontainer.cpp
b/synfig-studio/trunk/src/gtkmm/audiocontainer.cpp
index
5640ac4
..
70d5dd9
100644
(file)
--- 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 <fmod.h>
#endif
+#include "general.h"
+
#endif
/* === U S I N G =========================================================== */
#endif
/* === U S I N G =========================================================== */
@@
-851,7
+853,7
@@
studio::AudioContainer::~AudioContainer()
if(imp) delete (imp);
}
if(imp) delete (imp);
}
-bool studio::AudioContainer::load(const st
ring &filename,const
string &filedirectory)
+bool studio::AudioContainer::load(const st
d::string &filename,const std::
string &filedirectory)
{
if(!imp)
{
{
if(!imp)
{
@@
-1187,9
+1189,9
@@
void studio::AudioContainer::AudioImp::clear()
}
#ifdef WITH_FMOD
}
#ifdef WITH_FMOD
-void AudioContainer::AudioImp::start_scrubbing(double t)
+void
studio::
AudioContainer::AudioImp::start_scrubbing(double t)
#else
#else
-void AudioContainer::AudioImp::start_scrubbing(double /*t*/)
+void
studio::
AudioContainer::AudioImp::start_scrubbing(double /*t*/)
#endif
{
//synfig::info("Start scrubbing: %lf", t);
#endif
{
//synfig::info("Start scrubbing: %lf", t);
@@
-1241,7
+1243,7
@@
void AudioContainer::AudioImp::start_scrubbing(double /*t*/)
#endif
}
#endif
}
-void AudioContainer::AudioImp::stop_scrubbing()
+void
studio::
AudioContainer::AudioImp::stop_scrubbing()
{
//synfig::info("Stop scrubbing");
{
//synfig::info("Stop scrubbing");
@@
-1263,9
+1265,9
@@
void AudioContainer::AudioImp::stop_scrubbing()
}
#ifdef WITH_FMOD
}
#ifdef WITH_FMOD
-void AudioContainer::AudioImp::scrub(double t)
+void
studio::
AudioContainer::AudioImp::scrub(double t)
#else
#else
-void AudioContainer::AudioImp::scrub(double /*t*/)
+void
studio::
AudioContainer::AudioImp::scrub(double /*t*/)
#endif
{
#ifdef WITH_FMOD
#endif
{
#ifdef WITH_FMOD
@@
-1284,7
+1286,7
@@
void AudioContainer::AudioImp::scrub(double /*t*/)
curscrubpos = newpos;
curscrubpos = newpos;
- //Ok the sound is running, now we need to twe
e
k it
+ //Ok the sound is running, now we need to twe
a
k it
if(newpos > oldpos)
{
//Outside so completely stopped...
if(newpos > oldpos)
{
//Outside so completely stopped...