changes to allow window branch to build on OS X
This commit is contained in:
parent
5e19f0a1ae
commit
031675f795
@ -34,6 +34,7 @@
|
||||
#include <glibmm/threads.h>
|
||||
#include <glibmm/fileutils.h>
|
||||
#include <glibmm/miscutils.h>
|
||||
#include <glib/gstdio.h>
|
||||
|
||||
#include "ardour/ardour.h"
|
||||
#include "ardour/audioengine.h"
|
||||
@ -2453,7 +2454,7 @@ AUPluginInfo::save_cached_info ()
|
||||
|
||||
if (!tree.write (path)) {
|
||||
error << string_compose (_("could not save AU cache to %1"), path) << endmsg;
|
||||
::g_unlink (path.c_str());
|
||||
g_unlink (path.c_str());
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -130,13 +130,13 @@ ARDOUR::get_jack_default_audio_driver_name (string& audio_driver_name)
|
||||
}
|
||||
|
||||
void
|
||||
ARDOUR::get_jack_midi_system_names (const string& driver, vector<string>& midi_system_names)
|
||||
ARDOUR::get_jack_midi_system_names (const string& /*driver*/, vector<string>& midi_system_names)
|
||||
{
|
||||
midi_system_names.push_back (get_none_string ());
|
||||
#ifdef PLATFORM_WINDOWS
|
||||
midi_system_names.push_back (winmme_midi_driver_name);
|
||||
#elif __APPLE__
|
||||
midi_system_names.push_back (coreaudio_midi_driver_name);
|
||||
midi_system_names.push_back (coremidi_midi_driver_name);
|
||||
#else
|
||||
#ifdef HAVE_ALSA
|
||||
if (driver == alsa_driver_name) {
|
||||
@ -207,7 +207,7 @@ ARDOUR::get_jack_dither_mode_strings (const string& driver, vector<string>& dith
|
||||
}
|
||||
|
||||
string
|
||||
ARDOUR::get_jack_default_dither_mode (const string& driver)
|
||||
ARDOUR::get_jack_default_dither_mode (const string& /*driver*/)
|
||||
{
|
||||
return get_none_string ();
|
||||
}
|
||||
@ -354,6 +354,8 @@ ARDOUR::get_jack_alsa_device_names (device_map_t& devices)
|
||||
snd_ctl_close(handle);
|
||||
}
|
||||
}
|
||||
#else
|
||||
(void) devices;
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -465,6 +467,8 @@ ARDOUR::get_jack_portaudio_device_names (device_map_t& devices)
|
||||
}
|
||||
}
|
||||
Pa_Terminate();
|
||||
#else
|
||||
(void) devices;
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -578,7 +582,7 @@ ARDOUR::set_path_env_for_jack_autostart (const vector<std::string>& dirs)
|
||||
#ifdef __APPLE__
|
||||
// push it back into the environment so that auto-started JACK can find it.
|
||||
// XXX why can't we just expect OS X users to have PATH set correctly? we can't ...
|
||||
setenv ("PATH", SearchPath(dirs).to_string(), 1);
|
||||
setenv ("PATH", SearchPath(dirs).to_string().c_str(), 1);
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -627,7 +631,8 @@ ARDOUR::get_jack_server_paths (const vector<std::string>& server_dir_paths,
|
||||
vector<std::string>& server_paths)
|
||||
{
|
||||
for (vector<string>::const_iterator i = server_names.begin(); i != server_names.end(); ++i) {
|
||||
find_matching_files_in_directories (server_dir_paths, Glib::PatternSpec(*i), server_paths);
|
||||
Glib::PatternSpec ps (*i);
|
||||
find_matching_files_in_directories (server_dir_paths, ps, server_paths);
|
||||
}
|
||||
return !server_paths.empty();
|
||||
}
|
||||
@ -942,6 +947,8 @@ ARDOUR::start_jack_server (const string& command_line)
|
||||
Sleep (250); // 1/4 second
|
||||
if (jack_server_running ()) return true;
|
||||
}
|
||||
#else
|
||||
(void) command_line;
|
||||
#endif
|
||||
return false;
|
||||
}
|
||||
|
@ -51,7 +51,7 @@ ladspa_search_path ()
|
||||
#endif
|
||||
|
||||
#ifdef __APPLE__
|
||||
spath.push_back (expand_path ("~/Library/Audio/Plug-Ins/LADSPA"));
|
||||
spath.push_back (path_expand ("~/Library/Audio/Plug-Ins/LADSPA"));
|
||||
spath.push_back ("/Library/Audio/Plug-Ins/LADSPA");
|
||||
#endif
|
||||
|
||||
|
@ -587,7 +587,7 @@ Session::mmc_step_timeout ()
|
||||
|
||||
|
||||
void
|
||||
Session::send_song_position_pointer (framepos_t t)
|
||||
Session::send_song_position_pointer (framepos_t)
|
||||
{
|
||||
if (midi_clock) {
|
||||
/* Do nothing for the moment */
|
||||
|
@ -40,6 +40,11 @@
|
||||
#include <sys/vfs.h>
|
||||
#endif
|
||||
|
||||
#ifdef __APPLE__
|
||||
#include <sys/param.h>
|
||||
#include <sys/mount.h>
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_SYS_STATVFS_H
|
||||
#include <sys/statvfs.h>
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user