mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-16 03:36:32 +01:00
eliminating dependency on JACK
[git-p4: depot-paths = "//Abdaw/dev_main/tracks/": change = 452245]
This commit is contained in:
parent
dc2c38709b
commit
0e5ffd5784
15 changed files with 5 additions and 31 deletions
|
|
@ -21,8 +21,6 @@
|
||||||
#include "gtk2ardour-config.h"
|
#include "gtk2ardour-config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <jack/types.h>
|
|
||||||
|
|
||||||
#include "gtkmm2ext/utils.h"
|
#include "gtkmm2ext/utils.h"
|
||||||
|
|
||||||
#include "ardour/profile.h"
|
#include "ardour/profile.h"
|
||||||
|
|
@ -64,7 +62,7 @@ using namespace Editing;
|
||||||
|
|
||||||
/* XXX this is a hack. it ought to be the maximum value of an framepos_t */
|
/* XXX this is a hack. it ought to be the maximum value of an framepos_t */
|
||||||
|
|
||||||
const double max_canvas_coordinate = (double) JACK_MAX_FRAMES;
|
const double max_canvas_coordinate = (double) UINT32_MAX;
|
||||||
|
|
||||||
void
|
void
|
||||||
Editor::initialize_canvas ()
|
Editor::initialize_canvas ()
|
||||||
|
|
|
||||||
|
|
@ -1469,7 +1469,7 @@ Editor::update_punch_range_view ()
|
||||||
|
|
||||||
if (_session->config.get_punch_in()) {
|
if (_session->config.get_punch_in()) {
|
||||||
transport_punch_range_rect->set_x0 (sample_to_pixel (tpl->start()));
|
transport_punch_range_rect->set_x0 (sample_to_pixel (tpl->start()));
|
||||||
transport_punch_range_rect->set_x1 (_session->config.get_punch_out() ? sample_to_pixel (tpl->end()) : sample_to_pixel (JACK_MAX_FRAMES));
|
transport_punch_range_rect->set_x1 (_session->config.get_punch_out() ? sample_to_pixel (tpl->end()) : sample_to_pixel (max_framepos));
|
||||||
} else {
|
} else {
|
||||||
transport_punch_range_rect->set_x0 (0);
|
transport_punch_range_rect->set_x0 (0);
|
||||||
transport_punch_range_rect->set_x1 (_session->config.get_punch_out() ? sample_to_pixel (tpl->end()) : v.width ());
|
transport_punch_range_rect->set_x1 (_session->config.get_punch_out() ? sample_to_pixel (tpl->end()) : v.width ());
|
||||||
|
|
|
||||||
|
|
@ -18,8 +18,6 @@
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <jack/types.h>
|
|
||||||
|
|
||||||
#include <glib/gstdio.h>
|
#include <glib/gstdio.h>
|
||||||
|
|
||||||
#include "ardour/profile.h"
|
#include "ardour/profile.h"
|
||||||
|
|
|
||||||
|
|
@ -26,8 +26,6 @@
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <jack/jack.h>
|
|
||||||
#include <jack/thread.h>
|
|
||||||
#include <libgen.h>
|
#include <libgen.h>
|
||||||
|
|
||||||
#include <pthread.h>
|
#include <pthread.h>
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,6 @@
|
||||||
#include <gtkmm/box.h>
|
#include <gtkmm/box.h>
|
||||||
#include <gtkmm/window.h>
|
#include <gtkmm/window.h>
|
||||||
#include <gtkmm/actiongroup.h>
|
#include <gtkmm/actiongroup.h>
|
||||||
#include <jack/types.h>
|
|
||||||
#include <sigc++/signal.h>
|
#include <sigc++/signal.h>
|
||||||
|
|
||||||
#include "evoral/types.hpp"
|
#include "evoral/types.hpp"
|
||||||
|
|
|
||||||
|
|
@ -38,8 +38,6 @@
|
||||||
#include "ardour/types.h"
|
#include "ardour/types.h"
|
||||||
#include "ardour/libardour_visibility.h"
|
#include "ardour/libardour_visibility.h"
|
||||||
|
|
||||||
#include <jack/jack.h>
|
|
||||||
|
|
||||||
namespace MIDI {
|
namespace MIDI {
|
||||||
class MachineControl;
|
class MachineControl;
|
||||||
class Port;
|
class Port;
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,6 @@
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
#include <jack/jack.h>
|
|
||||||
|
|
||||||
#include <glibmm/threads.h>
|
#include <glibmm/threads.h>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,6 @@
|
||||||
|
|
||||||
#include "pbd/stateful.h"
|
#include "pbd/stateful.h"
|
||||||
|
|
||||||
#include <jack/types.h>
|
|
||||||
#include "ardour/ladspa.h"
|
#include "ardour/ladspa.h"
|
||||||
#include "ardour/plugin.h"
|
#include "ardour/plugin.h"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,6 @@
|
||||||
#include "pbd/statefuldestructible.h"
|
#include "pbd/statefuldestructible.h"
|
||||||
#include "pbd/controllable.h"
|
#include "pbd/controllable.h"
|
||||||
|
|
||||||
#include <jack/types.h>
|
|
||||||
#include "ardour/chan_count.h"
|
#include "ardour/chan_count.h"
|
||||||
#include "ardour/chan_mapping.h"
|
#include "ardour/chan_mapping.h"
|
||||||
#include "ardour/cycles.h"
|
#include "ardour/cycles.h"
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,6 @@
|
||||||
#include <set>
|
#include <set>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <jack/jack.h>
|
|
||||||
#include <boost/utility.hpp>
|
#include <boost/utility.hpp>
|
||||||
#include "pbd/signals.h"
|
#include "pbd/signals.h"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,6 @@
|
||||||
|
|
||||||
#include <glibmm/threads.h>
|
#include <glibmm/threads.h>
|
||||||
|
|
||||||
#include <jack/jack.h>
|
|
||||||
#include <ltc.h>
|
#include <ltc.h>
|
||||||
|
|
||||||
#include "pbd/signals.h"
|
#include "pbd/signals.h"
|
||||||
|
|
|
||||||
|
|
@ -32,8 +32,6 @@
|
||||||
#include "ardour/process_thread.h"
|
#include "ardour/process_thread.h"
|
||||||
#include "ardour/audioengine.h"
|
#include "ardour/audioengine.h"
|
||||||
|
|
||||||
#include <jack/thread.h>
|
|
||||||
|
|
||||||
#include "i18n.h"
|
#include "i18n.h"
|
||||||
|
|
||||||
using namespace ARDOUR;
|
using namespace ARDOUR;
|
||||||
|
|
|
||||||
|
|
@ -21,10 +21,6 @@
|
||||||
#include "libardour-config.h"
|
#include "libardour-config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef PLATFORM_WINDOWS
|
|
||||||
#include <jack/weakjack.h> // so that we can test for new functions at runtime
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "pbd/compose.h"
|
#include "pbd/compose.h"
|
||||||
#include "pbd/error.h"
|
#include "pbd/error.h"
|
||||||
#include "pbd/failed_constructor.h"
|
#include "pbd/failed_constructor.h"
|
||||||
|
|
@ -382,7 +378,7 @@ Port::get_connected_latency_range (LatencyRange& range, bool playback) const
|
||||||
|
|
||||||
boost::shared_ptr<Port> remote_port = AudioEngine::instance()->get_port_by_name (*c);
|
boost::shared_ptr<Port> remote_port = AudioEngine::instance()->get_port_by_name (*c);
|
||||||
if (remote_port) {
|
if (remote_port) {
|
||||||
lr = remote_port->private_latency_range ((playback ? JackPlaybackLatency : JackCaptureLatency));
|
lr = remote_port->private_latency_range ((playback ? true : false));
|
||||||
DEBUG_TRACE (DEBUG::Latency, string_compose (
|
DEBUG_TRACE (DEBUG::Latency, string_compose (
|
||||||
"\t%1 <-LOCAL-> %2 : latter has latency range %3 .. %4\n",
|
"\t%1 <-LOCAL-> %2 : latter has latency range %3 .. %4\n",
|
||||||
name(), *c, lr.min, lr.max));
|
name(), *c, lr.min, lr.max));
|
||||||
|
|
|
||||||
|
|
@ -22,10 +22,6 @@
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
||||||
#include <jack/types.h> /* XXX ... desirable to get rid of this but needed for
|
|
||||||
* now due to use of JackPortIsXXXX
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <pthread.h>
|
#include <pthread.h>
|
||||||
|
|
||||||
#include "pbd/xml++.h"
|
#include "pbd/xml++.h"
|
||||||
|
|
@ -47,8 +43,8 @@ class PortRequest;
|
||||||
class LIBMIDIPP_API Port {
|
class LIBMIDIPP_API Port {
|
||||||
public:
|
public:
|
||||||
enum Flags {
|
enum Flags {
|
||||||
IsInput = JackPortIsInput,
|
IsInput = 0x1, /* MUST MATCH JACK's JackPortIsInput */
|
||||||
IsOutput = JackPortIsOutput,
|
IsOutput = 0x2, /* MUST MATCH JACK's JackPortIsOutput */
|
||||||
};
|
};
|
||||||
|
|
||||||
Port (std::string const &, Flags);
|
Port (std::string const &, Flags);
|
||||||
|
|
|
||||||
|
|
@ -28,8 +28,6 @@
|
||||||
|
|
||||||
#include "ardour/types.h"
|
#include "ardour/types.h"
|
||||||
|
|
||||||
#include <jack/types.h>
|
|
||||||
|
|
||||||
#include "timecode/time.h"
|
#include "timecode/time.h"
|
||||||
|
|
||||||
#include "control_protocol/visibility.h"
|
#include "control_protocol/visibility.h"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue