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

Move RecordState to ardour/types.h

Browse source 
This allows it to be used without including session.h.
This commit is contained in:
David Robillard 2021-06-15 19:58:23 -04:00
parent de345dd790
commit 666b3ba920
20 changed files with 54 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gtk2_ardour/ardour_ui.cc
View file

@ -1787,7 +1787,7 @@ ARDOUR_UI::transport_record (bool roll)
{
if (_session) {
switch (_session->record_status()) {
case Session::Disabled:
case RecordState::Disabled:
if (_session->ntracks() == 0) {
ArdourMessageDialog msg (_main_window, _("Please create one or more tracks before trying to record.\nYou can do this with the \"Add Track or Bus\" option in the Session menu."));
msg.run ();
@ -1798,7 +1798,7 @@ ARDOUR_UI::transport_record (bool roll)
transport_roll ();
}
break;
case Session::Recording:
case RecordState::Recording:
if (roll) {
_session->request_stop();
} else {
@ -1806,7 +1806,7 @@ ARDOUR_UI::transport_record (bool roll)
}
break;
case Session::Enabled:
case RecordState::Enabled:
if (roll) {
transport_roll();
} else {

2
gtk2_ardour/ardour_ui3.cc
View file

@ -232,7 +232,7 @@ ARDOUR_UI::record_state_changed ()
ActionManager::set_sensitive (ActionManager::rec_sensitive_actions, !_session->actively_recording());
if (_session->record_status () == Session::Recording && _session->have_rec_enabled_track ()) {
if (_session->record_status () == RecordState::Recording && _session->have_rec_enabled_track ()) {
big_clock->set_active (true);
} else {
big_clock->set_active (false);

4
gtk2_ardour/audio_streamview.cc
View file

@ -200,7 +200,7 @@ AudioStreamView::setup_rec_box ()
// cerr << "\trolling\n";
if (!rec_active &&
_trackview.session()->record_status() == Session::Recording &&
_trackview.session()->record_status() == RecordState::Recording &&
_trackview.track()->rec_enable_control()->get_value()) {
if (_trackview.audio_track()->mode() == Normal && UIConfiguration::instance().get_show_waveforms_while_recording() && rec_regions.size() == rec_rects.size()) {
@ -253,7 +253,7 @@ AudioStreamView::setup_rec_box ()
create_rec_box(sample_pos, 0);
} else if (rec_active &&
(_trackview.session()->record_status() != Session::Recording ||
(_trackview.session()->record_status() != RecordState::Recording ||
!_trackview.track()->rec_enable_control()->get_value())) {
screen_update_connection.disconnect();
rec_active = false;

2
gtk2_ardour/editor_routes.cc
View file

@ -1688,7 +1688,7 @@ EditorRoutes::idle_update_mute_rec_solo_etc()
boost::shared_ptr<MidiTrack> mt = boost::dynamic_pointer_cast<MidiTrack> (route);
if (trk->rec_enable_control()->get_value()) {
if (_session->record_status() == Session::Recording) {
if (_session->record_status() == RecordState::Recording) {
(*i)[_columns.rec_state] = 1;
} else {
(*i)[_columns.rec_state] = 2;

4
gtk2_ardour/midi_streamview.cc
View file

@ -459,7 +459,7 @@ MidiStreamView::setup_rec_box ()
(_trackview.session()->transport_rolling() || _trackview.session()->get_record_enabled())) {
if (!rec_active &&
_trackview.session()->record_status() == Session::Recording &&
_trackview.session()->record_status() == RecordState::Recording &&
_trackview.track()->rec_enable_control()->get_value()) {
if (UIConfiguration::instance().get_show_waveforms_while_recording() && rec_regions.size() == rec_rects.size()) {
@ -528,7 +528,7 @@ MidiStreamView::setup_rec_box ()
create_rec_box (_trackview.midi_track()->current_capture_start(), 0);
} else if (rec_active &&
(_trackview.session()->record_status() != Session::Recording ||
(_trackview.session()->record_status() != RecordState::Recording ||
!_trackview.track()->rec_enable_control()->get_value())) {
screen_update_connection.disconnect();
rec_active = false;

6
gtk2_ardour/route_ui.cc
View file

@ -1376,12 +1376,12 @@ RouteUI::blink_rec_display (bool blinkOn)
if (track()->rec_enable_control()->get_value()) {
switch (_session->record_status ()) {
case Session::Recording:
case RecordState::Recording:
rec_enable_button->set_active_state (Gtkmm2ext::ExplicitActive);
break;
case Session::Disabled:
case Session::Enabled:
case RecordState::Disabled:
case RecordState::Enabled:
if (UIConfiguration::instance().get_blink_rec_arm()) {
rec_enable_button->set_active_state ( blinkOn ? Gtkmm2ext::ExplicitActive : Gtkmm2ext::Off );
} else {

6
gtk2_ardour/transport_control_ui.cc
View file

@ -305,16 +305,16 @@ TransportControlUI::blink_rec_enable (bool onoff)
return;
}
Session::RecordState const r = _session->record_status ();
RecordState const r = _session->record_status ();
bool const h = _session->have_rec_enabled_track ();
if (r == Session::Enabled || (r == Session::Recording && !h)) {
if (r == RecordState::Enabled || (r == RecordState::Recording && !h)) {
if (onoff) {
rec_button.set_active_state (Gtkmm2ext::ExplicitActive);
} else {
rec_button.set_active_state (Gtkmm2ext::Off);
}
} else if (r == Session::Recording && h) {
} else if (r == RecordState::Recording && h) {
rec_button.set_active_state (Gtkmm2ext::ExplicitActive);
} else {
rec_button.unset_active_state ();

6
libs/ardour/ardour/session.h
View file

@ -198,12 +198,6 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop
private:
public:
enum RecordState {
Disabled = 0,
Enabled = 1,
Recording = 2
};
/* a new session might have non-empty mix_template, an existing session should always have an empty one.
the bus profile can be null if no master out bus is required.
*/

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

@ -811,6 +811,12 @@ enum LocateTransportDisposition {
RollIfAppropriate
};
enum RecordState {
Disabled = 0,
Enabled = 1,
Recording = 2
};
typedef std::vector<CaptureInfo*> CaptureInfos;
} // namespace ARDOUR

10
libs/ardour/enums.cc
View file

@ -99,7 +99,7 @@ setup_enum_writer ()
SyncSource _SyncSource;
TransportRequestType _TransportRequestType;
ShuttleUnits _ShuttleUnits;
Session::RecordState _Session_RecordState;
RecordState _RecordState;
SessionEvent::Type _SessionEvent_Type;
SessionEvent::Action _SessionEvent_Action;
TimecodeFormat _Session_TimecodeFormat;
@ -436,10 +436,10 @@ setup_enum_writer ()
REGISTER_ENUM (Semitones);
REGISTER (_ShuttleUnits);
REGISTER_CLASS_ENUM (Session, Disabled);
REGISTER_CLASS_ENUM (Session, Enabled);
REGISTER_CLASS_ENUM (Session, Recording);
REGISTER (_Session_RecordState);
REGISTER_ENUM (Disabled);
REGISTER_ENUM (Enabled);
REGISTER_ENUM (Recording);
REGISTER (_RecordState);
REGISTER_CLASS_ENUM (SessionEvent, SetTransportSpeed);
REGISTER_CLASS_ENUM (SessionEvent, SetDefaultPlaySpeed);

6
libs/ardour/luabindings.cc
View file

@ -2548,9 +2548,9 @@ LuaBindings::common (lua_State* L)
.beginNamespace ("Session")
.beginNamespace ("RecordState")
.addConst ("Disabled", ARDOUR::Session::RecordState(Session::Disabled))
.addConst ("Enabled", ARDOUR::Session::RecordState(Session::Enabled))
.addConst ("Recording", ARDOUR::Session::RecordState(Session::Recording))
.addConst ("Disabled", ARDOUR::RecordState(Disabled))
.addConst ("Enabled", ARDOUR::RecordState(Enabled))
.addConst ("Recording", ARDOUR::RecordState(Recording))
.endNamespace ()
.endNamespace () // end Session enums

2
libs/ardour/midi_track.cc
View file

@ -744,7 +744,7 @@ MidiTrack::MidiControl::actually_set_value (double val, PBD::Controllable::Group
void
MidiTrack::set_step_editing (bool yn)
{
if (_session.record_status() != Session::Disabled) {
if (_session.record_status() != Disabled) {
return;
}

6
libs/surfaces/cc121/cc121.cc
View file

@ -643,13 +643,13 @@ CC121::map_recenable_state ()
bool onoff;
switch (_session->record_status()) {
case Session::Disabled:
case RecordState::Disabled:
onoff = false;
break;
case Session::Enabled:
case RecordState::Enabled:
onoff = blink_state;
break;
case Session::Recording:
case RecordState::Recording:
if (_session->have_rec_enabled_track ()) {
onoff = true;
} else {

6
libs/surfaces/control_protocol/basic_ui.cc
View file

@ -370,7 +370,7 @@ void
BasicUI::rec_enable_toggle ()
{
switch (_session->record_status()) {
case Session::Disabled:
case RecordState::Disabled:
if (_session->ntracks() == 0) {
// string txt = _("Please create 1 or more track\nbefore trying to record.\nCheck the Session menu.");
// MessageDialog msg (*editor, txt);
@ -379,8 +379,8 @@ BasicUI::rec_enable_toggle ()
}
_session->maybe_enable_record ();
break;
case Session::Recording:
case Session::Enabled:
case RecordState::Recording:
case RecordState::Enabled:
_session->disable_record (false, true);
}
}

6
libs/surfaces/faderport/faderport.cc
View file

@ -660,13 +660,13 @@ FaderPort::map_recenable_state ()
bool onoff;
switch (_session->record_status()) {
case Session::Disabled:
case RecordState::Disabled:
onoff = false;
break;
case Session::Enabled:
case RecordState::Enabled:
onoff = blink_state;
break;
case Session::Recording:
case RecordState::Recording:
if (_session->have_rec_enabled_track ()) {
onoff = true;
} else {

6
libs/surfaces/faderport8/callbacks.cc
View file

@ -149,15 +149,15 @@ void
FaderPort8::notify_record_state_changed ()
{
switch (_session->record_status ()) {
case Session::Disabled:
case RecordState::Disabled:
_ctrls.button (FP8Controls::BtnRecord).set_active (0);
_ctrls.button (FP8Controls::BtnRecord).set_blinking (false);
break;
case Session::Enabled:
case RecordState::Enabled:
_ctrls.button (FP8Controls::BtnRecord).set_active (true);
_ctrls.button (FP8Controls::BtnRecord).set_blinking (true);
break;
case Session::Recording:
case RecordState::Recording:
_ctrls.button (FP8Controls::BtnRecord).set_active (true);
_ctrls.button (FP8Controls::BtnRecord).set_blinking (false);
break;

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

@ -1418,15 +1418,15 @@ MackieControlProtocol::notify_record_state_changed ()
LedState ls;
switch (_session->record_status()) {
case Session::Disabled:
case RecordState::Disabled:
DEBUG_TRACE (DEBUG::MackieControl, "record state changed to disabled, LED off\n");
ls = off;
break;
case Session::Recording:
case RecordState::Recording:
DEBUG_TRACE (DEBUG::MackieControl, "record state changed to recording, LED on\n");
ls = on;
break;
case Session::Enabled:
case RecordState::Enabled:
if(_device_info.is_qcon()){
// For qcon the rec button is two state only (on/off)

6
libs/surfaces/maschine2/callbacks.cc
View file

@ -109,15 +109,15 @@ void
Maschine2::notify_record_state_changed ()
{
switch (_session->record_status ()) {
case Session::Disabled:
case RecordState::Disabled:
_ctrl->button (M2Contols::Rec)->set_color (0);
_ctrl->button (M2Contols::Rec)->set_blinking (false);
break;
case Session::Enabled:
case RecordState::Enabled:
_ctrl->button (M2Contols::Rec)->set_color (COLOR_WHITE);
_ctrl->button (M2Contols::Rec)->set_blinking (true);
break;
case Session::Recording:
case RecordState::Recording:
_ctrl->button (M2Contols::Rec)->set_color (COLOR_WHITE);
_ctrl->button (M2Contols::Rec)->set_blinking (false);
break;

6
libs/surfaces/push2/push2.cc
View file

@ -888,15 +888,15 @@ Push2::notify_record_state_changed ()
}
switch (_session->record_status ()) {
case Session::Disabled:
case RecordState::Disabled:
b->second->set_color (LED::White);
b->second->set_state (LED::NoTransition);
break;
case Session::Enabled:
case RecordState::Enabled:
b->second->set_color (LED::Red);
b->second->set_state (LED::Blinking4th);
break;
case Session::Recording:
case RecordState::Recording:
b->second->set_color (LED::Red);
b->second->set_state (LED::OneShot24th);
break;

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

@ -1138,15 +1138,15 @@ US2400Protocol::notify_record_state_changed ()
LedState ls;
switch (_session->record_status()) {
case Session::Disabled:
case RecordState::Disabled:
DEBUG_TRACE (DEBUG::US2400, "record state changed to disabled, LED off\n");
ls = off;
break;
case Session::Recording:
case RecordState::Recording:
DEBUG_TRACE (DEBUG::US2400, "record state changed to recording, LED on\n");
ls = on;
break;
case Session::Enabled:
case RecordState::Enabled:
DEBUG_TRACE (DEBUG::US2400, "record state changed to enabled, LED flashing\n");
ls = flashing;
break;