From 9ac6bb9befa047a6c349bed02d40da84600b67cc Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 24 Jul 2013 19:29:45 -0400 Subject: part-way through getting the audioengine changes to compile --- libs/ardour/midi_diskstream.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libs/ardour/midi_diskstream.cc') diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc index 9c11e818ac..ff6147d285 100644 --- a/libs/ardour/midi_diskstream.cc +++ b/libs/ardour/midi_diskstream.cc @@ -1097,7 +1097,7 @@ MidiDiskstream::prep_record_enable () boost::shared_ptr sp = _source_port.lock (); if (sp && Config->get_monitoring_model() == HardwareMonitoring) { - sp->request_jack_monitors_input (!(_session.config.get_auto_input() && rolling)); + sp->request_input_monitoring (!(_session.config.get_auto_input() && rolling)); } return true; @@ -1250,7 +1250,7 @@ MidiDiskstream::ensure_jack_monitors_input (bool yn) boost::shared_ptr sp = _source_port.lock (); if (sp) { - sp->ensure_jack_monitors_input (yn); + sp->ensure_input_monitoring (yn); } } -- cgit v1.2.3 From ca76496ef377e826d356f9d29f6a57393c59298a Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 9 Aug 2013 13:56:23 -0400 Subject: more purging of JACK as an explicit name from libardour --- libs/ardour/ardour/diskstream.h | 4 ++-- libs/ardour/ardour/jack_portengine.h | 3 +++ libs/ardour/ardour/midi_diskstream.h | 2 +- libs/ardour/ardour/midi_port.h | 2 +- libs/ardour/ardour/public_diskstream.h | 4 ++-- libs/ardour/ardour/slave.h | 2 +- libs/ardour/ardour/track.h | 4 ++-- libs/ardour/ardour/types.h | 14 ++++++-------- libs/ardour/audio_track.cc | 2 +- libs/ardour/midi_diskstream.cc | 2 +- libs/ardour/mtc_slave.cc | 2 +- libs/ardour/port.cc | 2 +- libs/ardour/route.cc | 2 +- libs/ardour/session.cc | 2 +- libs/ardour/track.cc | 8 ++++---- 15 files changed, 28 insertions(+), 27 deletions(-) (limited to 'libs/ardour/midi_diskstream.cc') diff --git a/libs/ardour/ardour/diskstream.h b/libs/ardour/ardour/diskstream.h index 427b52b054..7a4bccbb46 100644 --- a/libs/ardour/ardour/diskstream.h +++ b/libs/ardour/ardour/diskstream.h @@ -133,8 +133,8 @@ class Diskstream : public SessionObject, public PublicDiskstream virtual XMLNode& get_state(void); virtual int set_state(const XMLNode&, int version); - virtual void request_jack_monitors_input (bool) {} - virtual void ensure_jack_monitors_input (bool) {} + virtual void request_input_monitoring (bool) {} + virtual void ensure_input_monitoring (bool) {} framecnt_t capture_offset() const { return _capture_offset; } virtual void set_capture_offset (); diff --git a/libs/ardour/ardour/jack_portengine.h b/libs/ardour/ardour/jack_portengine.h index a267ebb32b..f8db0c6ec4 100644 --- a/libs/ardour/ardour/jack_portengine.h +++ b/libs/ardour/ardour/jack_portengine.h @@ -25,6 +25,9 @@ #include +#include +#include + #include #include "pbd/signals.h" diff --git a/libs/ardour/ardour/midi_diskstream.h b/libs/ardour/ardour/midi_diskstream.h index 34fa0ae79a..b1c126b339 100644 --- a/libs/ardour/ardour/midi_diskstream.h +++ b/libs/ardour/ardour/midi_diskstream.h @@ -81,7 +81,7 @@ class MidiDiskstream : public Diskstream XMLNode& get_state(void); int set_state(const XMLNode&, int version); - void ensure_jack_monitors_input (bool); + void ensure_input_monitoring (bool); boost::shared_ptr write_source () { return _write_source; } diff --git a/libs/ardour/ardour/midi_port.h b/libs/ardour/ardour/midi_port.h index 4a9a2ededc..14dc6cd021 100644 --- a/libs/ardour/ardour/midi_port.h +++ b/libs/ardour/ardour/midi_port.h @@ -67,7 +67,7 @@ class MidiPort : public Port { bool _resolve_required; bool _input_active; - void resolve_notes (void* jack_buffer, MidiBuffer::TimeType when); + void resolve_notes (void* buffer, MidiBuffer::TimeType when); }; } // namespace ARDOUR diff --git a/libs/ardour/ardour/public_diskstream.h b/libs/ardour/ardour/public_diskstream.h index da481a6dee..125e1a21ce 100644 --- a/libs/ardour/ardour/public_diskstream.h +++ b/libs/ardour/ardour/public_diskstream.h @@ -33,8 +33,8 @@ public: virtual ~PublicDiskstream() {} virtual boost::shared_ptr playlist () = 0; - virtual void request_jack_monitors_input (bool) = 0; - virtual void ensure_jack_monitors_input (bool) = 0; + virtual void request_input_monitoring (bool) = 0; + virtual void ensure_input_monitoring (bool) = 0; virtual bool destructive () const = 0; virtual std::list > & last_capture_sources () = 0; virtual void set_capture_offset () = 0; diff --git a/libs/ardour/ardour/slave.h b/libs/ardour/ardour/slave.h index adf425ea43..1d8a7dd965 100644 --- a/libs/ardour/ardour/slave.h +++ b/libs/ardour/ardour/slave.h @@ -363,7 +363,7 @@ public: std::string approximate_current_delta() const; private: - void parse_ltc(const jack_nframes_t, const jack_default_audio_sample_t * const, const framecnt_t); + void parse_ltc(const pframes_t, const Sample* const, const framecnt_t); void process_ltc(framepos_t const); void init_engine_dll (framepos_t, int32_t); bool detect_discontinuity(LTCFrameExt *, int, bool); diff --git a/libs/ardour/ardour/track.h b/libs/ardour/ardour/track.h index 7159261b51..bdf420763b 100644 --- a/libs/ardour/ardour/track.h +++ b/libs/ardour/ardour/track.h @@ -115,8 +115,8 @@ class Track : public Route, public PublicDiskstream /* PublicDiskstream interface */ boost::shared_ptr playlist (); - void request_jack_monitors_input (bool); - void ensure_jack_monitors_input (bool); + void request_input_monitoring (bool); + void ensure_input_monitoring (bool); bool destructive () const; std::list > & last_capture_sources (); void set_capture_offset (); diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h index 2fb4ec9691..17bffc20e4 100644 --- a/libs/ardour/ardour/types.h +++ b/libs/ardour/ardour/types.h @@ -28,8 +28,6 @@ #include #include -#include -#include #include "timecode/bbt_time.h" #include "timecode/time.h" @@ -53,12 +51,12 @@ namespace ARDOUR { class Route; class Region; - typedef jack_default_audio_sample_t Sample; - typedef float pan_t; - typedef float gain_t; - typedef uint32_t layer_t; - typedef uint64_t microseconds_t; - typedef jack_nframes_t pframes_t; + typedef float Sample; + typedef float pan_t; + typedef float gain_t; + typedef uint32_t layer_t; + typedef uint64_t microseconds_t; + typedef uint32_t pframes_t; /* Any position measured in audio frames. Assumed to be non-negative but not enforced. diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc index 0530dbfce9..a82c109cba 100644 --- a/libs/ardour/audio_track.cc +++ b/libs/ardour/audio_track.cc @@ -96,7 +96,7 @@ AudioTrack::set_diskstream (boost::shared_ptr ds) } _diskstream->set_record_enabled (false); - _diskstream->request_jack_monitors_input (false); + _diskstream->request_input_monitoring (false); DiskstreamChanged (); /* EMIT SIGNAL */ } diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc index e67ce9b831..088b2fcc40 100644 --- a/libs/ardour/midi_diskstream.cc +++ b/libs/ardour/midi_diskstream.cc @@ -1259,7 +1259,7 @@ MidiDiskstream::allocate_temporary_buffers () } void -MidiDiskstream::ensure_jack_monitors_input (bool yn) +MidiDiskstream::ensure_input_monitoring (bool yn) { boost::shared_ptr sp = _source_port.lock (); diff --git a/libs/ardour/mtc_slave.cc b/libs/ardour/mtc_slave.cc index b42b4989d2..80d89d6215 100644 --- a/libs/ardour/mtc_slave.cc +++ b/libs/ardour/mtc_slave.cc @@ -600,7 +600,7 @@ MTC_Slave::init_engine_dll (framepos_t pos, framepos_t inc) } /* main entry point from session_process.cc - * in jack_process callback context */ +xo * in process callback context */ bool MTC_Slave::speed_and_position (double& speed, framepos_t& pos) { diff --git a/libs/ardour/port.cc b/libs/ardour/port.cc index d37761b6f2..3aaa371f16 100644 --- a/libs/ardour/port.cc +++ b/libs/ardour/port.cc @@ -337,7 +337,7 @@ Port::get_connected_latency_range (LatencyRange& range, bool playback) const if (!connections.empty()) { - range.min = ~((jack_nframes_t) 0); + range.min = ~((pframes_t) 0); range.max = 0; DEBUG_TRACE (DEBUG::Latency, string_compose ("%1: %2 connections to check for latency range\n", name(), connections.size())); diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index 8e0ac8604e..d0b2260c3d 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -3820,7 +3820,7 @@ Route::update_port_latencies (PortSet& from, PortSet& to, bool playback, framecn all_connections.min = 0; all_connections.max = 0; } else { - all_connections.min = ~((jack_nframes_t) 0); + all_connections.min = ~((pframes_t) 0); all_connections.max = 0; /* iterate over all "from" ports and determine the latency range for all of their diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index cc4a99b11f..dc6456b73f 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -942,7 +942,7 @@ Session::set_track_monitor_input_status (bool yn) boost::shared_ptr tr = boost::dynamic_pointer_cast (*i); if (tr && tr->record_enabled ()) { //cerr << "switching to input = " << !auto_input << __FILE__ << __LINE__ << endl << endl; - tr->request_jack_monitors_input (yn); + tr->request_input_monitoring (yn); } } } diff --git a/libs/ardour/track.cc b/libs/ardour/track.cc index f02863393e..57239cb841 100644 --- a/libs/ardour/track.cc +++ b/libs/ardour/track.cc @@ -550,15 +550,15 @@ Track::playlist () } void -Track::request_jack_monitors_input (bool m) +Track::request_input_monitoring (bool m) { - _diskstream->request_jack_monitors_input (m); + _diskstream->request_input_monitoring (m); } void -Track::ensure_jack_monitors_input (bool m) +Track::ensure_input_monitoring (bool m) { - _diskstream->ensure_jack_monitors_input (m); + _diskstream->ensure_input_monitoring (m); } bool -- cgit v1.2.3 From 2de09888b6be3c0d81a1a8089b9a8e87ececa0ee Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 14 Aug 2013 12:40:49 -0400 Subject: some const_cast<> additions for OS X where gcc believes that volatile int* means const int* --- gtk2_ardour/midi_tracer.cc | 6 +++--- libs/ardour/midi_diskstream.cc | 16 ++++++++-------- libs/gtkmm2ext/prolooks_helpers.c | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'libs/ardour/midi_diskstream.cc') diff --git a/gtk2_ardour/midi_tracer.cc b/gtk2_ardour/midi_tracer.cc index ba116d39aa..ea4b0c2d54 100644 --- a/gtk2_ardour/midi_tracer.cc +++ b/gtk2_ardour/midi_tracer.cc @@ -404,9 +404,9 @@ MidiTracer::tracer (Parser&, byte* msg, size_t len) fifo.write (&buf, 1); - if (g_atomic_int_get (&_update_queued) == 0) { + if (g_atomic_int_get (const_cast (&_update_queued)) == 0) { gui_context()->call_slot (invalidator (*this), boost::bind (&MidiTracer::update, this)); - g_atomic_int_inc (&_update_queued); + g_atomic_int_inc (const_cast (&_update_queued)); } } @@ -414,7 +414,7 @@ void MidiTracer::update () { bool updated = false; - g_atomic_int_dec_and_test (&_update_queued); + g_atomic_int_dec_and_test (const_cast (&_update_queued)); RefPtr buf (text.get_buffer()); diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc index 088b2fcc40..66a3754e2d 100644 --- a/libs/ardour/midi_diskstream.cc +++ b/libs/ardour/midi_diskstream.cc @@ -202,8 +202,8 @@ MidiDiskstream::non_realtime_input_change () seek (_session.transport_frame()); } - g_atomic_int_set(&_frames_pending_write, 0); - g_atomic_int_set(&_num_captured_loops, 0); + g_atomic_int_set(const_cast (&_frames_pending_write), 0); + g_atomic_int_set(const_cast (&_num_captured_loops), 0); } int @@ -376,8 +376,8 @@ MidiDiskstream::process (BufferSet& bufs, framepos_t transport_frame, pframes_t } _write_source->mark_write_starting_now( capture_start_frame, capture_captured, loop_length); - g_atomic_int_set(&_frames_pending_write, 0); - g_atomic_int_set(&_num_captured_loops, 0); + g_atomic_int_set(const_cast (&_frames_pending_write), 0); + g_atomic_int_set(const_cast (&_num_captured_loops), 0); was_recording = true; } } @@ -446,7 +446,7 @@ MidiDiskstream::process (BufferSet& bufs, framepos_t transport_frame, pframes_t break; } } - g_atomic_int_add(&_frames_pending_write, nframes); + g_atomic_int_add(const_cast (&_frames_pending_write), nframes); if (buf.size() != 0) { Glib::Threads::Mutex::Lock lm (_gui_feed_buffer_mutex, Glib::Threads::TRY_LOCK); @@ -799,7 +799,7 @@ MidiDiskstream::do_flush (RunContext /*context*/, bool force_flush) return 0; } - const framecnt_t total = g_atomic_int_get(&_frames_pending_write); + const framecnt_t total = g_atomic_int_get(const_cast (&_frames_pending_write)); if (total == 0 || _capture_buf->read_space() == 0 || @@ -834,7 +834,7 @@ MidiDiskstream::do_flush (RunContext /*context*/, bool force_flush) error << string_compose(_("MidiDiskstream %1: cannot write to disk"), id()) << endmsg; return -1; } - g_atomic_int_add(&_frames_pending_write, -to_write); + g_atomic_int_add(const_cast (&_frames_pending_write), -to_write); } out: @@ -1044,7 +1044,7 @@ MidiDiskstream::transport_looped (framepos_t) the Source and/or entirely after the capture is finished. */ if (was_recording) { - g_atomic_int_add(&_num_captured_loops, 1); + g_atomic_int_add(const_cast (&_num_captured_loops), 1); } } diff --git a/libs/gtkmm2ext/prolooks_helpers.c b/libs/gtkmm2ext/prolooks_helpers.c index 1489a8cb3e..cdac2dbafe 100644 --- a/libs/gtkmm2ext/prolooks_helpers.c +++ b/libs/gtkmm2ext/prolooks_helpers.c @@ -891,7 +891,7 @@ GType prolooks_hsl_get_type (void) { gpointer prolooks_hsl_ref (gpointer instance) { ProlooksHSL* self; self = instance; - g_atomic_int_inc (&self->ref_count); + g_atomic_int_inc (&self->ref_count); return instance; } -- cgit v1.2.3