projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add matrix.h. Matrix implementation for bones.
[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
2420133
..
70d5dd9
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/audiocontainer.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/audiocontainer.cpp
@@
-853,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)
{
@@
-1189,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);
@@
-1243,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");
@@
-1265,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