smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-03 20:29:35 +01:00
Code Issues Projects Releases Wiki Activity

NO-OP: whitespace

Browse source
This commit is contained in:
Robin Gareus 2019-04-08 01:56:52 +02:00
parent e4f18c1771
commit 94409c80f3
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
4 changed files with 60 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

40
libs/ardour/ardour/location.h
View file

@ -14,7 +14,6 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef __ardour_location_h__
@ -44,7 +43,7 @@ class SceneChange;
/** Location on Timeline - abstract representation for Markers, Loop/Punch Ranges, CD-Markers etc. */
class LIBARDOUR_API Location : public SessionHandleRef, public PBD::StatefulDestructible
{
public:
public:
enum Flags {
IsMark = 0x1,
IsAutoPunch = 0x2,
@ -70,7 +69,7 @@ class LIBARDOUR_API Location : public SessionHandleRef, public PBD::StatefulDest
void lock ();
void unlock ();
samplepos_t start() const { return _start; }
samplepos_t start() const { return _start; }
samplepos_t end() const { return _end; }
samplecnt_t length() const { return _end - _start; }
@ -110,8 +109,8 @@ class LIBARDOUR_API Location : public SessionHandleRef, public PBD::StatefulDest
void set_scene_change (boost::shared_ptr<SceneChange>);
/* these are static signals for objects that want to listen to all
locations at once.
*/
* locations at once.
*/
static PBD::Signal1<void,Location*> name_changed;
static PBD::Signal1<void,Location*> end_changed;
@ -124,8 +123,8 @@ class LIBARDOUR_API Location : public SessionHandleRef, public PBD::StatefulDest
static PBD::Signal1<void,Location*> changed;
/* these are member signals for objects that care only about
changes to this object
*/
* changes to this object
*/
PBD::Signal0<void> Changed;
@ -149,13 +148,13 @@ class LIBARDOUR_API Location : public SessionHandleRef, public PBD::StatefulDest
void recompute_samples_from_beat ();
static PBD::Signal0<void> scene_changed; /* for use by backend scene change management, class level */
PBD::Signal0<void> SceneChangeChanged; /* for use by objects interested in this object */
PBD::Signal0<void> SceneChangeChanged; /* for use by objects interested in this object */
private:
private:
std::string _name;
samplepos_t _start;
samplepos_t _start;
double _start_beat;
samplepos_t _end;
samplepos_t _end;
double _end_beat;
Flags _flags;
bool _locked;
@ -170,7 +169,7 @@ class LIBARDOUR_API Location : public SessionHandleRef, public PBD::StatefulDest
/** A collection of session locations including unique dedicated locations (loop, punch, etc) */
class LIBARDOUR_API Locations : public SessionHandleRef, public PBD::StatefulDestructible
{
public:
public:
typedef std::list<Location *> LocationList;
Locations (Session &);
@ -214,8 +213,8 @@ class LIBARDOUR_API Locations : public SessionHandleRef, public PBD::StatefulDes
PBD::Signal1<void,Location*> current_changed;
/* Objects that care about individual addition and removal of Locations should connect to added/removed.
If an object additionally cares about potential mass clearance of Locations, they should connect to changed.
*/
* If an object additionally cares about potential mass clearance of Locations, they should connect to changed.
*/
PBD::Signal1<void,Location*> added;
PBD::Signal1<void,Location*> removed;
@ -223,8 +222,8 @@ class LIBARDOUR_API Locations : public SessionHandleRef, public PBD::StatefulDes
template<class T> void apply (T& obj, void (T::*method)(const LocationList&)) const {
/* We don't want to hold the lock while the given method runs, so take a copy
of the list and pass that instead.
*/
* of the list and pass that instead.
*/
Locations::LocationList copy;
{
Glib::Threads::Mutex::Lock lm (lock);
@ -233,11 +232,10 @@ class LIBARDOUR_API Locations : public SessionHandleRef, public PBD::StatefulDes
(obj.*method)(copy);
}
private:
LocationList locations;
Location *current_location;
mutable Glib::Threads::Mutex lock;
private:
LocationList locations;
Location* current_location;
mutable Glib::Threads::Mutex lock;
int set_current_unlocked (Location *);
void location_changed (Location*);

10
libs/ardour/ardour/ltc_file_reader.h
View file

@ -41,8 +41,8 @@ public:
samplepos_t read (uint32_t& hh, uint32_t& mm, uint32_t& ss, uint32_t& ff);
private:
LTCDecoder* _decoder;
samplecnt_t _position;
LTCDecoder* _decoder;
samplecnt_t _position;
};
class LIBARDOUR_API LTCFileReader
@ -76,9 +76,9 @@ private:
SNDFILE* _sndfile;
SF_INFO _info;
LTCReader* _reader;
float* _interleaved_audio_buffer;
samplecnt_t _samples_read;
LTCReader* _reader;
float* _interleaved_audio_buffer;
samplecnt_t _samples_read;
};

62
libs/ardour/ardour/lua_api.h
View file

@ -300,8 +300,8 @@ namespace ARDOUR { namespace LuaAPI {
private:
::Vamp::Plugin* _plugin;
float _sample_rate;
samplecnt_t _bufsize;
samplecnt_t _stepsize;
samplecnt_t _bufsize;
samplecnt_t _stepsize;
bool _initialized;
};
@ -366,41 +366,41 @@ namespace ARDOUR { namespace LuaOSC {
}
class LuaTableRef {
public:
LuaTableRef ();
~LuaTableRef ();
public:
LuaTableRef ();
~LuaTableRef ();
int get (lua_State* L);
int set (lua_State* L);
int get (lua_State* L);
int set (lua_State* L);
private:
struct LuaTableEntry {
LuaTableEntry (int kt, int vt)
: keytype (kt)
, valuetype (vt)
{ }
private:
struct LuaTableEntry {
LuaTableEntry (int kt, int vt)
: keytype (kt)
, valuetype (vt)
{ }
int keytype;
std::string k_s;
unsigned int k_n;
int keytype;
std::string k_s;
unsigned int k_n;
int valuetype;
// LUA_TUSERDATA
const void* c;
void* p;
// LUA_TBOOLEAN
bool b;
// LUA_TSTRING:
std::string s;
// LUA_TNUMBER:
double n;
};
int valuetype;
// LUA_TUSERDATA
const void* c;
void* p;
// LUA_TBOOLEAN
bool b;
// LUA_TSTRING:
std::string s;
// LUA_TNUMBER:
double n;
};
std::vector<LuaTableEntry> _data;
std::vector<LuaTableEntry> _data;
static void* findclasskey (lua_State *L, const void* key);
template<typename T>
static void assign (luabridge::LuaRef* rv, T key, const LuaTableEntry& s);
static void* findclasskey (lua_State *L, const void* key);
template<typename T>
static void assign (luabridge::LuaRef* rv, T key, const LuaTableEntry& s);
};
} /* namespace */

10
libs/ardour/ardour/lv2_plugin.h
View file

@ -59,7 +59,7 @@ class LIBARDOUR_API LV2Plugin : public ARDOUR::Plugin, public ARDOUR::Workee
LV2Plugin (ARDOUR::AudioEngine& engine,
ARDOUR::Session& session,
const void* c_plugin,
samplecnt_t sample_rate);
samplecnt_t sample_rate);
LV2Plugin (const LV2Plugin &);
~LV2Plugin ();
@ -177,7 +177,7 @@ class LIBARDOUR_API LV2Plugin : public ARDOUR::Plugin, public ARDOUR::Workee
LV2_Feature** _features;
Worker* _worker;
Worker* _state_worker;
samplecnt_t _sample_rate;
samplecnt_t _sample_rate;
float* _control_data;
float* _shadow_data;
float* _defaults;
@ -186,7 +186,7 @@ class LIBARDOUR_API LV2Plugin : public ARDOUR::Plugin, public ARDOUR::Workee
float* _bpm_control_port; ///< Special input set by ardour
float* _freewheel_control_port; ///< Special input set by ardour
float* _latency_control_port; ///< Special output set by ardour
samplepos_t _next_cycle_start; ///< Expected start sample of next run cycle
samplepos_t _next_cycle_start; ///< Expected start sample of next run cycle
double _next_cycle_speed; ///< Expected start sample of next run cycle
double _next_cycle_beat; ///< Expected bar_beat of next run cycle
double _current_bpm;
@ -197,8 +197,8 @@ class LIBARDOUR_API LV2Plugin : public ARDOUR::Plugin, public ARDOUR::Workee
URIMap& _uri_map;
bool _no_sample_accurate_ctrl;
bool _can_write_automation;
samplecnt_t _max_latency;
samplecnt_t _current_latency;
samplecnt_t _max_latency;
samplecnt_t _current_latency;
friend const void* lv2plugin_get_port_value(const char* port_symbol,
void* user_data,