projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove unused enum
[ardour.git]
/
libs
/
ardour
/
ardour
/
port.h
diff --git
a/libs/ardour/ardour/port.h
b/libs/ardour/ardour/port.h
index 96c18442b7d77be42c4697b90ec5c4509e31ef8f..619b8ba0f2dfb729fb2e8242467c4d0454fbca63 100644
(file)
--- a/
libs/ardour/ardour/port.h
+++ b/
libs/ardour/ardour/port.h
@@
-25,11
+25,12
@@
#include <set>
#include <string>
#include <vector>
#include <set>
#include <string>
#include <vector>
-#include <jack/jack.h>
#include <boost/utility.hpp>
#include "pbd/signals.h"
#include "ardour/data_type.h"
#include <boost/utility.hpp>
#include "pbd/signals.h"
#include "ardour/data_type.h"
+#include "ardour/port_engine.h"
+#include "ardour/libardour_visibility.h"
#include "ardour/types.h"
namespace ARDOUR {
#include "ardour/types.h"
namespace ARDOUR {
@@
-37,14
+38,9
@@
namespace ARDOUR {
class AudioEngine;
class Buffer;
class AudioEngine;
class Buffer;
-class Port : public boost::noncopyable
+class
LIBARDOUR_API
Port : public boost::noncopyable
{
public:
{
public:
- enum Flags {
- IsInput = JackPortIsInput,
- IsOutput = JackPortIsOutput,
- };
-
virtual ~Port ();
static void set_connecting_blocked( bool yn ) {
virtual ~Port ();
static void set_connecting_blocked( bool yn ) {
@@
-59,10
+55,14
@@
public:
return _name;
}
return _name;
}
+ /** @return Port human readable name */
+ std::string pretty_name (bool fallback_to_name = false) const;
+ bool set_pretty_name (const std::string&);
+
int set_name (std::string const &);
/** @return flags */
int set_name (std::string const &);
/** @return flags */
- Flags flags () const {
+
Port
Flags flags () const {
return _flags;
}
return _flags;
}
@@
-90,24
+90,24
@@
public:
virtual int connect (Port *);
int disconnect (Port *);
virtual int connect (Port *);
int disconnect (Port *);
- void ensure_monitor_input (bool);
+ void request_input_monitoring (bool);
+ void ensure_input_monitoring (bool);
bool monitoring_input () const;
int reestablish ();
int reconnect ();
bool monitoring_input () const;
int reestablish ();
int reconnect ();
- void request_monitor_input (bool);
bool last_monitor() const { return _last_monitor; }
void set_last_monitor (bool yn) { _last_monitor = yn; }
bool last_monitor() const { return _last_monitor; }
void set_last_monitor (bool yn) { _last_monitor = yn; }
-
jack_port_t* jack_port() const { return _jack_port
; }
+
PortEngine::PortHandle port_handle() { return _port_handle
; }
- void get_connected_latency_range (
jack_latency_range_t
& range, bool playback) const;
+ void get_connected_latency_range (
LatencyRange
& range, bool playback) const;
- void set_private_latency_range (
jack_latency_range_t
& range, bool playback);
- const
jack_latency_range_t
& private_latency_range (bool playback) const;
+ void set_private_latency_range (
LatencyRange
& range, bool playback);
+ const
LatencyRange
& private_latency_range (bool playback) const;
- void set_public_latency_range (
jack_latency_range_t
& range, bool playback) const;
-
jack_latency_range_t
public_latency_range (bool playback) const;
+ void set_public_latency_range (
LatencyRange
& range, bool playback) const;
+
LatencyRange
public_latency_range (bool playback) const;
virtual void reset ();
virtual void reset ();
@@
-116,16
+116,16
@@
public:
virtual void cycle_end (pframes_t) = 0;
virtual void cycle_split () = 0;
virtual Buffer& get_buffer (pframes_t nframes) = 0;
virtual void cycle_end (pframes_t) = 0;
virtual void cycle_split () = 0;
virtual Buffer& get_buffer (pframes_t nframes) = 0;
- virtual void flush_buffers (pframes_t /*nframes*/
, framepos_t /*time*/
) {}
+ virtual void flush_buffers (pframes_t /*nframes*/) {}
virtual void transport_stopped () {}
virtual void realtime_locate () {}
bool physically_connected () const;
virtual void transport_stopped () {}
virtual void realtime_locate () {}
bool physically_connected () const;
- static void set_engine (AudioEngine *);
-
PBD::Signal1<void,bool> MonitorInputChanged;
PBD::Signal1<void,bool> MonitorInputChanged;
-
+ static PBD::Signal2<void,boost::shared_ptr<Port>,boost::shared_ptr<Port> > PostDisconnect;
+ static PBD::Signal0<void> PortDrop;
+ static PBD::Signal0<void> PortSignalDrop;
static void set_cycle_framecnt (pframes_t n) {
_cycle_nframes = n;
static void set_cycle_framecnt (pframes_t n) {
_cycle_nframes = n;
@@
-140,11
+140,16
@@
public:
virtual void increment_port_buffer_offset (pframes_t n);
virtual void increment_port_buffer_offset (pframes_t n);
+ virtual XMLNode& get_state (void) const;
+ virtual int set_state (const XMLNode&, int version);
+
+ static std::string state_node_name;
+
protected:
protected:
- Port (std::string const &, DataType, Flags);
+ Port (std::string const &, DataType,
Port
Flags);
- jack_port_t* _jack_port; ///< JACK port
+ PortEngine::PortHandle _port_handle;
static bool _connecting_blocked;
static pframes_t _global_port_buffer_offset; /* access only from process() tree */
static bool _connecting_blocked;
static pframes_t _global_port_buffer_offset; /* access only from process() tree */
@@
-152,21
+157,24
@@
protected:
framecnt_t _port_buffer_offset; /* access only from process() tree */
framecnt_t _port_buffer_offset; /* access only from process() tree */
- jack_latency_range_t _private_playback_latency;
- jack_latency_range_t _private_capture_latency;
-
- static AudioEngine* _engine; ///< the AudioEngine
+ LatencyRange _private_playback_latency;
+ LatencyRange _private_capture_latency;
private:
std::string _name; ///< port short name
private:
std::string _name; ///< port short name
- Flags _flags; ///< flags
+
Port
Flags _flags; ///< flags
bool _last_monitor;
/** ports that we are connected to, kept so that we can
bool _last_monitor;
/** ports that we are connected to, kept so that we can
- reconnect to
JACK
when required
+ reconnect to
the backend
when required
*/
std::set<std::string> _connections;
*/
std::set<std::string> _connections;
+ void port_connected_or_disconnected (boost::weak_ptr<Port>, boost::weak_ptr<Port>, bool);
+ void signal_drop ();
+ void drop ();
+ PBD::ScopedConnection drop_connection;
+ PBD::ScopedConnection engine_connection;
};
}
};
}