projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use Color::is_straight(). Also, re-enable the optimization for straight blending...
[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
759adc6
..
70d5dd9
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/audiocontainer.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/audiocontainer.cpp
@@
-2,7
+2,7
@@
/*! \file audiocontainer.cpp
** \brief Audio Container implementation File
**
/*! \file audiocontainer.cpp
** \brief Audio Container implementation File
**
-** $Id
: audiocontainer.cpp,v 1.1.1.1 2005/01/07 03:34:35 darco Exp
$
+** $Id$
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@
-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 =========================================================== */
@@
-81,7
+83,11
@@
const double delay_factor = 3;
struct FSOUND_SAMPLE;
using studio::AudioContainer;
struct FSOUND_SAMPLE;
using studio::AudioContainer;
+#ifdef WITH_FMOD
bool build_profile(FSOUND_SAMPLE *sample, double &samplerate, std::vector<char> &samples)
bool build_profile(FSOUND_SAMPLE *sample, double &samplerate, std::vector<char> &samples)
+#else
+bool build_profile(FSOUND_SAMPLE */*sample*/, double &/*samplerate*/, std::vector<char> &/*samples*/)
+#endif
{
#ifdef WITH_FMOD
{
#ifdef WITH_FMOD
@@
-685,7
+691,11
@@
struct studio::AudioContainer::AudioImp
scrubinfo *scrptr;
bool is_scrubbing() const {return scrptr != 0;}
scrubinfo *scrptr;
bool is_scrubbing() const {return scrptr != 0;}
+#ifdef WITH_FMOD
void set_scrubbing(bool s)
void set_scrubbing(bool s)
+#else
+ void set_scrubbing(bool /*s*/)
+#endif
{
#ifdef WITH_FMOD
if(s)
{
#ifdef WITH_FMOD
if(s)
@@
-790,7
+800,11
@@
public: //forward interface
}
//Will override the parameter timevalue if the sound is running, and not if it's not...
}
//Will override the parameter timevalue if the sound is running, and not if it's not...
+#ifdef WITH_FMOD
bool get_current_time(double &out)
bool get_current_time(double &out)
+#else
+ bool get_current_time(double &/*out*/)
+#endif
{
if(isRunning())
{
{
if(isRunning())
{
@@
-839,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)
{
@@
-850,7
+864,11
@@
bool studio::AudioContainer::load(const string &filename,const string &filedirec
return imp->load(filename,filedirectory);
}
return imp->load(filename,filedirectory);
}
+#ifdef WITH_FMOD
handle<studio::AudioProfile> studio::AudioContainer::get_profile(float samplerate)
handle<studio::AudioProfile> studio::AudioContainer::get_profile(float samplerate)
+#else
+handle<studio::AudioProfile> studio::AudioContainer::get_profile(float /*samplerate*/)
+#endif
{
#ifdef WITH_FMOD
{
#ifdef WITH_FMOD
@@
-985,8
+1003,13
@@
bool AudioContainer::isPaused() const
//----------- Audio imp information -------------------
//----------- Audio imp information -------------------
+#ifdef WITH_FMOD
bool studio::AudioContainer::AudioImp::load(const std::string &filename,
const std::string &filedirectory)
bool studio::AudioContainer::AudioImp::load(const std::string &filename,
const std::string &filedirectory)
+#else
+bool studio::AudioContainer::AudioImp::load(const std::string &/*filename*/,
+ const std::string &/*filedirectory*/)
+#endif
{
clear();
{
clear();
@@
-1074,7
+1097,11
@@
error:
#endif
}
#endif
}
+#ifdef WITH_FMOD
void studio::AudioContainer::AudioImp::play(double t)
void studio::AudioContainer::AudioImp::play(double t)
+#else
+void studio::AudioContainer::AudioImp::play(double /*t*/)
+#endif
{
#ifdef WITH_FMOD
if(!sample) return;
{
#ifdef WITH_FMOD
if(!sample) return;
@@
-1161,7
+1188,11
@@
void studio::AudioContainer::AudioImp::clear()
playing = false;
}
playing = false;
}
-void AudioContainer::AudioImp::start_scrubbing(double t)
+#ifdef WITH_FMOD
+void studio::AudioContainer::AudioImp::start_scrubbing(double t)
+#else
+void studio::AudioContainer::AudioImp::start_scrubbing(double /*t*/)
+#endif
{
//synfig::info("Start scrubbing: %lf", t);
if(playing) stop();
{
//synfig::info("Start scrubbing: %lf", t);
if(playing) stop();
@@
-1212,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");
@@
-1233,7
+1264,11
@@
void AudioContainer::AudioImp::stop_scrubbing()
curscrubpos = 0;
}
curscrubpos = 0;
}
-void AudioContainer::AudioImp::scrub(double t)
+#ifdef WITH_FMOD
+void studio::AudioContainer::AudioImp::scrub(double t)
+#else
+void studio::AudioContainer::AudioImp::scrub(double /*t*/)
+#endif
{
#ifdef WITH_FMOD
//synfig::info("Scrub to %lf",t);
{
#ifdef WITH_FMOD
//synfig::info("Scrub to %lf",t);
@@
-1251,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...