projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Large nasty commit in the form of a 5000 line patch chock-full of completely
[ardour.git]
/
libs
/
ardour
/
ardour
/
ardour.h
diff --git
a/libs/ardour/ardour/ardour.h
b/libs/ardour/ardour/ardour.h
index 45b45ecd06f717d1b5264a7adfb19d555384bf20..c0dfea9a950e9edccc885a363dcbdc933feaf728 100644
(file)
--- a/
libs/ardour/ardour/ardour.h
+++ b/
libs/ardour/ardour/ardour.h
@@
-26,14
+26,11
@@
#include <signal.h>
#include <pbd/error.h>
#include <signal.h>
#include <pbd/error.h>
-#include <pbd/lockmonitor.h>
#include <pbd/failed_constructor.h>
#include <ardour/configuration.h>
#include <ardour/types.h>
#include <pbd/failed_constructor.h>
#include <ardour/configuration.h>
#include <ardour/types.h>
-using namespace PBD;
-
namespace MIDI {
class MachineControl;
class Port;
namespace MIDI {
class MachineControl;
class Port;
@@
-42,15
+39,19
@@
namespace MIDI {
namespace ARDOUR {
class AudioEngine;
namespace ARDOUR {
class AudioEngine;
+ class OSC;
+
+ extern OSC* osc;
static const jack_nframes_t max_frames = JACK_MAX_FRAMES;
static const jack_nframes_t max_frames = JACK_MAX_FRAMES;
- int init (AudioEngine&, bool with_vst, bool try_optimization
, void (*sighandler)(int,siginfo_t*,void*) = 0
);
+ int init (AudioEngine&, bool with_vst, bool try_optimization);
int cleanup ();
std::string get_user_ardour_path ();
int cleanup ();
std::string get_user_ardour_path ();
- std::string get_system_ardour_path ();
+ std::string get_system_data_path ();
+ std::string get_system_module_path ();
std::string find_config_file (std::string name);
std::string find_data_file (std::string name, std::string subdir = "" );
std::string find_config_file (std::string name);
std::string find_data_file (std::string name, std::string subdir = "" );