diff options
author | John Emmas <johne53@tiscali.co.uk> | 2013-08-09 18:04:04 +0100 |
---|---|---|
committer | John Emmas <johne53@tiscali.co.uk> | 2013-08-09 18:04:04 +0100 |
commit | 8cd71108c1d153f84f25c3b9e5153a110826c130 (patch) | |
tree | 6518ec0abd7c241b81e9c0f245214ac6e697de35 | |
parent | 5f703f25a9c73912d2d28c29c52130e5f363c768 (diff) | |
parent | 031675f79566a5400f6109d90a1ec824dce76945 (diff) |
Merge branch 'windows' of git.ardour.org:ardour/ardour into windows
-rw-r--r-- | libs/ardour/audio_unit.cc | 3 | ||||
-rw-r--r-- | libs/ardour/jack_utils.cc | 17 | ||||
-rw-r--r-- | libs/ardour/ladspa_search_path.cc | 2 | ||||
-rw-r--r-- | libs/ardour/meter.cc | 9 | ||||
-rw-r--r-- | libs/ardour/session_midi.cc | 2 | ||||
-rw-r--r-- | libs/ardour/session_state.cc | 5 |
6 files changed, 26 insertions, 12 deletions
diff --git a/libs/ardour/audio_unit.cc b/libs/ardour/audio_unit.cc index 83d2c46ba6..1a24977399 100644 --- a/libs/ardour/audio_unit.cc +++ b/libs/ardour/audio_unit.cc @@ -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()); } } diff --git a/libs/ardour/jack_utils.cc b/libs/ardour/jack_utils.cc index 1b94c2f3f7..3334a6fe94 100644 --- a/libs/ardour/jack_utils.cc +++ b/libs/ardour/jack_utils.cc @@ -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; } diff --git a/libs/ardour/ladspa_search_path.cc b/libs/ardour/ladspa_search_path.cc index 769e5cd617..5ba7a17167 100644 --- a/libs/ardour/ladspa_search_path.cc +++ b/libs/ardour/ladspa_search_path.cc @@ -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 diff --git a/libs/ardour/meter.cc b/libs/ardour/meter.cc index 54cad1a956..6c5470bbb9 100644 --- a/libs/ardour/meter.cc +++ b/libs/ardour/meter.cc @@ -18,6 +18,7 @@ #include <algorithm> #include <cmath> +#include <limits> #include "pbd/compose.h" @@ -149,7 +150,7 @@ void PeakMeter::reset_max () { for (size_t i = 0; i < _max_peak_power.size(); ++i) { - _max_peak_power[i] = -INFINITY; + _max_peak_power[i] = -std::numeric_limits<float>::infinity(); _max_peak_signal[i] = 0; } @@ -159,7 +160,7 @@ PeakMeter::reset_max () if (n < n_midi) { _visible_peak_power[n] = 0; } else { - _visible_peak_power[n] = -INFINITY; + _visible_peak_power[n] = -std::numeric_limits<float>::infinity(); } } } @@ -298,7 +299,7 @@ PeakMeter::meter () _peak_signal[n] = 0; /* ... to here */ if (n < n_midi) { - _max_peak_power[n] = -INFINITY; // std::max (new_peak, _max_peak_power[n]); // XXX + _max_peak_power[n] = -std::numeric_limits<float>::infinity(); // std::max (new_peak, _max_peak_power[n]); // XXX _max_peak_signal[n] = 0; if (midi_meter_falloff == 0.0f || new_peak > _visible_peak_power[n]) { ; @@ -332,7 +333,7 @@ PeakMeter::meter () } else { // do falloff new_peak = _visible_peak_power[n] - (audio_meter_falloff); - _visible_peak_power[n] = std::max ((double)new_peak, -INFINITY); + _visible_peak_power[n] = std::max (new_peak, -std::numeric_limits<float>::infinity()); } } } diff --git a/libs/ardour/session_midi.cc b/libs/ardour/session_midi.cc index b211ef14e3..9a7ca5b734 100644 --- a/libs/ardour/session_midi.cc +++ b/libs/ardour/session_midi.cc @@ -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 */ diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index 80f1e87972..f588080f25 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -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 |