smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-16 03:36:32 +01:00
Code Issues Projects Releases Wiki Activity

eliminating dependency on JACK

Browse source 
[git-p4: depot-paths = "//Abdaw/dev_main/tracks/": change = 452245]
This commit is contained in:
Valeriy Kamyshniy 2014-04-10 09:50:18 -05:00
parent dc2c38709b
commit 0e5ffd5784
15 changed files with 5 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gtk2_ardour/editor_canvas.cc
View file

@ -21,8 +21,6 @@
#include "gtk2ardour-config.h"
#endif
#include <jack/types.h>
#include "gtkmm2ext/utils.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 */
const double max_canvas_coordinate = (double) JACK_MAX_FRAMES;
const double max_canvas_coordinate = (double) UINT32_MAX;
void
Editor::initialize_canvas ()

2
gtk2_ardour/editor_markers.cc
View file

@ -1469,7 +1469,7 @@ Editor::update_punch_range_view ()
if (_session->config.get_punch_in()) {
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 {
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 ());

2
gtk2_ardour/editor_videotimeline.cc
View file

@ -18,8 +18,6 @@
*/
#include <jack/types.h>
#include <glib/gstdio.h>
#include "ardour/profile.h"

2
gtk2_ardour/linux_vst_gui_support.cc
View file

@ -26,8 +26,6 @@
#include <stdlib.h>
#include <stdio.h>
#include <jack/jack.h>
#include <jack/thread.h>
#include <libgen.h>
#include <pthread.h>

1
gtk2_ardour/public_editor.h
View file

@ -32,7 +32,6 @@
#include <gtkmm/box.h>
#include <gtkmm/window.h>
#include <gtkmm/actiongroup.h>
#include <jack/types.h>
#include <sigc++/signal.h>
#include "evoral/types.hpp"

2
libs/ardour/ardour/ardour.h
View file

@ -38,8 +38,6 @@
#include "ardour/types.h"
#include "ardour/libardour_visibility.h"
#include <jack/jack.h>
namespace MIDI {
class MachineControl;
class Port;

1
libs/ardour/ardour/io.h
View file

@ -23,7 +23,6 @@
#include <string>
#include <vector>
#include <cmath>
#include <jack/jack.h>
#include <glibmm/threads.h>

1
libs/ardour/ardour/ladspa_plugin.h
View file

@ -28,7 +28,6 @@
#include "pbd/stateful.h"
#include <jack/types.h>
#include "ardour/ladspa.h"
#include "ardour/plugin.h"

1
libs/ardour/ardour/plugin.h
View file

@ -26,7 +26,6 @@
#include "pbd/statefuldestructible.h"
#include "pbd/controllable.h"
#include <jack/types.h>
#include "ardour/chan_count.h"
#include "ardour/chan_mapping.h"
#include "ardour/cycles.h"

1
libs/ardour/ardour/port.h
View file

@ -25,7 +25,6 @@
#include <set>
#include <string>
#include <vector>
#include <jack/jack.h>
#include <boost/utility.hpp>
#include "pbd/signals.h"

1
libs/ardour/ardour/slave.h
View file

@ -24,7 +24,6 @@
#include <glibmm/threads.h>
#include <jack/jack.h>
#include <ltc.h>
#include "pbd/signals.h"

2
libs/ardour/graph.cc
View file

@ -32,8 +32,6 @@
#include "ardour/process_thread.h"
#include "ardour/audioengine.h"
#include <jack/thread.h>
#include "i18n.h"
using namespace ARDOUR;

6
libs/ardour/port.cc
View file

@ -21,10 +21,6 @@
#include "libardour-config.h"
#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/error.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);
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 (
"\t%1 <-LOCAL-> %2 : latter has latency range %3 .. %4\n",
name(), *c, lr.min, lr.max));

8
libs/midi++2/midi++/port.h
View file

@ -22,10 +22,6 @@
#include <string>
#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 "pbd/xml++.h"
@ -47,8 +43,8 @@ class PortRequest;
class LIBMIDIPP_API Port {
public:
enum Flags {
IsInput = JackPortIsInput,
IsOutput = JackPortIsOutput,
IsInput = 0x1, /* MUST MATCH JACK's JackPortIsInput */
IsOutput = 0x2, /* MUST MATCH JACK's JackPortIsOutput */
};
Port (std::string const &, Flags);

2
libs/surfaces/control_protocol/control_protocol/basic_ui.h
View file

@ -28,8 +28,6 @@
#include "ardour/types.h"
#include <jack/types.h>
#include "timecode/time.h"
#include "control_protocol/visibility.h"