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

Resolve microseconds_t ambiguity 1/2

Browse source 
This resolves a PBD vs ARDOUR namespace error for some compilers:
```
error: reference to 'microseconds_t' is ambiguous
libs/pbd/pbd/microseconds.h:29:19: error: candidates are: typedef uint64_t PBD::microseconds_t
libs/ardour/ardour/types.h:81:29: error:                  typedef PBD::microseconds_t ARDOUR::microseconds_t
```
This commit is contained in:
Robin Gareus 2021-06-27 17:32:12 +02:00
parent 6077cf1f7b
commit b58dfc7f0f
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
19 changed files with 27 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -78,7 +78,6 @@ typedef float Sample;
typedef float pan_t; typedef float pan_t;
typedef float gain_t; typedef float gain_t;
typedef uint32_t layer_t; typedef uint32_t layer_t;
typedef PBD::microseconds_t microseconds_t;
typedef uint32_t pframes_t; typedef uint32_t pframes_t;
/* rebind Temporal position types into ARDOUR namespace */ /* rebind Temporal position types into ARDOUR namespace */

2
libs/surfaces/cc121/cc121.h
View file

@ -199,7 +199,7 @@ class CC121 : public ARDOUR::ControlProtocol, public AbstractUI<CC121Request> {
enum JogMode { scroll=1, zoom=2 }; enum JogMode { scroll=1, zoom=2 };
JogMode _jogmode; JogMode _jogmode;
ARDOUR::microseconds_t last_encoder_time; PBD::microseconds_t last_encoder_time;
int last_good_encoder_delta; int last_good_encoder_delta;
int last_encoder_delta, last_last_encoder_delta; int last_encoder_delta, last_last_encoder_delta;

2
libs/surfaces/faderport/faderport.h
View file

@ -197,7 +197,7 @@ class FaderPort : public ARDOUR::ControlProtocol, public AbstractUI<FaderPortReq
int fader_lsb; int fader_lsb;
bool fader_is_touched; bool fader_is_touched;
ARDOUR::microseconds_t last_encoder_time; PBD::microseconds_t last_encoder_time;
int last_good_encoder_delta; int last_good_encoder_delta;
int last_encoder_delta, last_last_encoder_delta; int last_encoder_delta, last_last_encoder_delta;

6
libs/surfaces/generic_midi/generic_midi_control_protocol.h
View file

@ -78,7 +78,7 @@ public:
boost::shared_ptr<ARDOUR::Port> input_port () const; boost::shared_ptr<ARDOUR::Port> input_port () const;
boost::shared_ptr<ARDOUR::Port> output_port () const; boost::shared_ptr<ARDOUR::Port> output_port () const;
void set_feedback_interval (ARDOUR::microseconds_t); void set_feedback_interval (PBD::microseconds_t);
int set_feedback (bool yn); int set_feedback (bool yn);
bool get_feedback () const; bool get_feedback () const;
@ -133,8 +133,8 @@ private:
boost::shared_ptr<ARDOUR::AsyncMIDIPort> _input_port; boost::shared_ptr<ARDOUR::AsyncMIDIPort> _input_port;
boost::shared_ptr<ARDOUR::AsyncMIDIPort> _output_port; boost::shared_ptr<ARDOUR::AsyncMIDIPort> _output_port;
ARDOUR::microseconds_t _feedback_interval; PBD::microseconds_t _feedback_interval;
ARDOUR::microseconds_t last_feedback_time; PBD::microseconds_t last_feedback_time;
bool do_feedback; bool do_feedback;
void _send_feedback (); void _send_feedback ();

2
libs/surfaces/mackie/button.cc
View file

@ -58,7 +58,7 @@ Button::long_press_count ()
return -1; /* button is not pressed */ return -1; /* button is not pressed */
} }
const ARDOUR::microseconds_t delta = PBD::get_microseconds () - press_time; const PBD::microseconds_t delta = PBD::get_microseconds () - press_time;
if (delta < 500000) { if (delta < 500000) {
return 0; return 0;

2
libs/surfaces/mackie/button.h
View file

@ -155,7 +155,7 @@ private:
Surface& _surface; Surface& _surface;
ID _bid; /* device independent button ID */ ID _bid; /* device independent button ID */
Led _led; Led _led;
ARDOUR::microseconds_t press_time; PBD::microseconds_t press_time;
}; };
} // Mackie namespace } // Mackie namespace

4
libs/surfaces/mackie/mackie_control_protocol.cc
View file

@ -536,7 +536,7 @@ MackieControlProtocol::periodic ()
update_timecode_display (); update_timecode_display ();
ARDOUR::microseconds_t now_usecs = PBD::get_microseconds (); PBD::microseconds_t now_usecs = PBD::get_microseconds ();
{ {
Glib::Threads::Mutex::Lock lm (surfaces_lock); Glib::Threads::Mutex::Lock lm (surfaces_lock);
@ -565,7 +565,7 @@ MackieControlProtocol::redisplay ()
initialize(); initialize();
} }
ARDOUR::microseconds_t now = PBD::get_microseconds (); PBD::microseconds_t now = PBD::get_microseconds ();
{ {
Glib::Threads::Mutex::Lock lm (surfaces_lock); Glib::Threads::Mutex::Lock lm (surfaces_lock);

4
libs/surfaces/mackie/strip.cc
View file

@ -828,14 +828,14 @@ Strip::handle_pot (Pot& pot, float delta)
} }
void void
Strip::periodic (ARDOUR::microseconds_t now) Strip::periodic (PBD::microseconds_t now)
{ {
update_meter (); update_meter ();
update_automation (); update_automation ();
} }
void void
Strip::redisplay (ARDOUR::microseconds_t now, bool force) Strip::redisplay (PBD::microseconds_t now, bool force)
{ {
if (_block_screen_redisplay_until >= now) { if (_block_screen_redisplay_until >= now) {
/* no drawing allowed */ /* no drawing allowed */

4
libs/surfaces/mackie/strip.h
View file

@ -88,8 +88,8 @@ public:
void handle_fader_touch (Fader&, bool touch_on); void handle_fader_touch (Fader&, bool touch_on);
void handle_pot (Pot&, float delta); void handle_pot (Pot&, float delta);
void periodic (ARDOUR::microseconds_t now_usecs); void periodic (PBD::microseconds_t now_usecs);
void redisplay (ARDOUR::microseconds_t now_usecs, bool force = true); void redisplay (PBD::microseconds_t now_usecs, bool force = true);
MidiByteArray display (uint32_t line_number, const std::string&); MidiByteArray display (uint32_t line_number, const std::string&);
MidiByteArray blank_display (uint32_t line_number); MidiByteArray blank_display (uint32_t line_number);

2
libs/surfaces/mackie/surface.cc
View file

@ -960,7 +960,7 @@ Surface::periodic (uint64_t now_usecs)
} }
void void
Surface::redisplay (ARDOUR::microseconds_t now, bool force) Surface::redisplay (PBD::microseconds_t now, bool force)
{ {
for (Strips::iterator s = strips.begin(); s != strips.end(); ++s) { for (Strips::iterator s = strips.begin(); s != strips.end(); ++s) {
(*s)->redisplay (now, force); (*s)->redisplay (now, force);

4
libs/surfaces/mackie/surface.h
View file

@ -113,8 +113,8 @@ public:
const MidiByteArray& sysex_hdr() const; const MidiByteArray& sysex_hdr() const;
void periodic (ARDOUR::microseconds_t now_usecs); void periodic (PBD::microseconds_t now_usecs);
void redisplay (ARDOUR::microseconds_t now_usecs, bool force); void redisplay (PBD::microseconds_t now_usecs, bool force);
void hui_heartbeat (); void hui_heartbeat ();
void handle_midi_pitchbend_message (MIDI::Parser&, MIDI::pitchbend_t, uint32_t channel_id); void handle_midi_pitchbend_message (MIDI::Parser&, MIDI::pitchbend_t, uint32_t channel_id);

2
libs/surfaces/push2/push2.h
View file

@ -522,7 +522,7 @@ class Push2 : public ARDOUR::ControlProtocol
bool vblank (); bool vblank ();
void splash (); void splash ();
ARDOUR::microseconds_t splash_start; PBD::microseconds_t splash_start;
/* the canvas */ /* the canvas */

2
libs/surfaces/us2400/button.cc
View file

@ -57,7 +57,7 @@ Button::long_press_count ()
return -1; /* button is not pressed */ return -1; /* button is not pressed */
} }
const ARDOUR::microseconds_t delta = PBD::get_microseconds () - press_time; const PBD::microseconds_t delta = PBD::get_microseconds () - press_time;
if (delta < 500000) { if (delta < 500000) {
return 0; return 0;

2
libs/surfaces/us2400/button.h
View file

@ -114,7 +114,7 @@ private:
Surface& _surface; Surface& _surface;
ID _bid; /* device independent button ID */ ID _bid; /* device independent button ID */
Led _led; Led _led;
ARDOUR::microseconds_t press_time; PBD::microseconds_t press_time;
}; };
} // US2400 namespace } // US2400 namespace

4
libs/surfaces/us2400/strip.cc
View file

@ -597,7 +597,7 @@ Strip::handle_pot (Pot& pot, float delta)
} }
void void
Strip::periodic (ARDOUR::microseconds_t now) Strip::periodic (PBD::microseconds_t now)
{ {
update_meter (); update_meter ();
@ -637,7 +637,7 @@ Strip::periodic (ARDOUR::microseconds_t now)
} }
void void
Strip::redisplay (ARDOUR::microseconds_t now, bool force) Strip::redisplay (PBD::microseconds_t now, bool force)
{ {
} }

4
libs/surfaces/us2400/strip.h
View file

@ -88,8 +88,8 @@ public:
void handle_fader_touch (Fader&, bool touch_on); void handle_fader_touch (Fader&, bool touch_on);
void handle_pot (Pot&, float delta); void handle_pot (Pot&, float delta);
void periodic (ARDOUR::microseconds_t now_usecs); void periodic (PBD::microseconds_t now_usecs);
void redisplay (ARDOUR::microseconds_t now_usecs, bool force = true); void redisplay (PBD::microseconds_t now_usecs, bool force = true);
void zero (); void zero ();

2
libs/surfaces/us2400/surface.cc
View file

@ -920,7 +920,7 @@ Surface::periodic (uint64_t now_usecs)
} }
void void
Surface::redisplay (ARDOUR::microseconds_t now, bool force) Surface::redisplay (PBD::microseconds_t now, bool force)
{ {
for (Strips::iterator s = strips.begin(); s != strips.end(); ++s) { for (Strips::iterator s = strips.begin(); s != strips.end(); ++s) {
(*s)->redisplay (now, force); (*s)->redisplay (now, force);

4
libs/surfaces/us2400/surface.h
View file

@ -112,8 +112,8 @@ public:
const MidiByteArray& sysex_hdr() const; const MidiByteArray& sysex_hdr() const;
void periodic (ARDOUR::microseconds_t now_usecs); void periodic (PBD::microseconds_t now_usecs);
void redisplay (ARDOUR::microseconds_t now_usecs, bool force); void redisplay (PBD::microseconds_t now_usecs, bool force);
void hui_heartbeat (); void hui_heartbeat ();
void handle_midi_pitchbend_message (MIDI::Parser&, MIDI::pitchbend_t, uint32_t channel_id); void handle_midi_pitchbend_message (MIDI::Parser&, MIDI::pitchbend_t, uint32_t channel_id);

2
libs/surfaces/us2400/us2400_control_protocol.cc
View file

@ -457,7 +457,7 @@ US2400Protocol::periodic ()
initialize(); initialize();
} }
ARDOUR::microseconds_t now_usecs = PBD::get_microseconds (); PBD::microseconds_t now_usecs = PBD::get_microseconds ();
{ {
Glib::Threads::Mutex::Lock lm (surfaces_lock); Glib::Threads::Mutex::Lock lm (surfaces_lock);