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

temporal: remove concept of inactive tempos

Browse source
This commit is contained in:
Paul Davis 2023-09-11 10:05:04 -06:00
parent 730bec5dc1
commit eca4c83b7b
2 changed files with 0 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

10
libs/temporal/tempo.cc
View file

@ -105,9 +105,6 @@ Tempo::Tempo (XMLNode const & node)
throw failed_constructor (); throw failed_constructor ();
} }
if (!node.get_property (X_("active"), _active)) {
throw failed_constructor ();
}
if (!node.get_property (X_("locked-to-meter"), _locked_to_meter)) { if (!node.get_property (X_("locked-to-meter"), _locked_to_meter)) {
_locked_to_meter = true; _locked_to_meter = true;
} }
@ -150,7 +147,6 @@ Tempo::get_state () const
node->set_property (X_("enpm"), end_note_types_per_minute()); node->set_property (X_("enpm"), end_note_types_per_minute());
node->set_property (X_("note-type"), note_type()); node->set_property (X_("note-type"), note_type());
node->set_property (X_("type"), type()); node->set_property (X_("type"), type());
node->set_property (X_("active"), active());
node->set_property (X_("locked-to-meter"), _locked_to_meter); node->set_property (X_("locked-to-meter"), _locked_to_meter);
node->set_property (X_("continuing"), _continuing); node->set_property (X_("continuing"), _continuing);
@ -173,7 +169,6 @@ Tempo::set_state (XMLNode const & node, int /*version*/)
_end_super_note_type_per_second = double_npm_to_snps (_enpm); _end_super_note_type_per_second = double_npm_to_snps (_enpm);
node.get_property (X_("note-type"), _note_type); node.get_property (X_("note-type"), _note_type);
node.get_property (X_("active"), _active);
if (!node.get_property (X_("locked-to-meter"), _locked_to_meter)) { if (!node.get_property (X_("locked-to-meter"), _locked_to_meter)) {
_locked_to_meter = true; _locked_to_meter = true;
@ -4518,11 +4513,6 @@ TempoMap::parse_tempo_state_3x (const XMLNode& node, LegacyTempoState& lts)
} }
} }
if (!node.get_property ("active", lts.active)) {
warning << _("TempoSection XML node has no \"active\" property") << endmsg;
lts.active = true;
}
return 0; return 0;
} }

9
libs/temporal/temporal/tempo.h
View file

@ -192,7 +192,6 @@ class LIBTEMPORAL_API Tempo {
, _super_note_type_per_second (double_npm_to_snps (npm)) , _super_note_type_per_second (double_npm_to_snps (npm))
, _end_super_note_type_per_second (double_npm_to_snps (npm)) , _end_super_note_type_per_second (double_npm_to_snps (npm))
, _note_type (note_type) , _note_type (note_type)
, _active (true)
, _locked_to_meter (false) , _locked_to_meter (false)
, _continuing (false) , _continuing (false)
{} {}
@ -205,7 +204,6 @@ class LIBTEMPORAL_API Tempo {
, _super_note_type_per_second (double_npm_to_snps (npm)) , _super_note_type_per_second (double_npm_to_snps (npm))
, _end_super_note_type_per_second (double_npm_to_snps (enpm)) , _end_super_note_type_per_second (double_npm_to_snps (enpm))
, _note_type (note_type) , _note_type (note_type)
, _active (true)
, _locked_to_meter (false) , _locked_to_meter (false)
, _continuing (false) , _continuing (false)
{} {}
@ -252,9 +250,6 @@ class LIBTEMPORAL_API Tempo {
t = PBD::muldiv_round (Temporal::ticks_per_beat, remain, big_numerator); t = PBD::muldiv_round (Temporal::ticks_per_beat, remain, big_numerator);
} }
bool active () const { return _active; }
void set_active (bool yn) { _active = yn; }
bool locked_to_meter () const { return _locked_to_meter; } bool locked_to_meter () const { return _locked_to_meter; }
void set_locked_to_meter (bool yn) { _locked_to_meter = yn; } void set_locked_to_meter (bool yn) { _locked_to_meter = yn; }
@ -271,7 +266,6 @@ class LIBTEMPORAL_API Tempo {
return _superclocks_per_note_type == other._superclocks_per_note_type && return _superclocks_per_note_type == other._superclocks_per_note_type &&
_end_superclocks_per_note_type == other._end_superclocks_per_note_type && _end_superclocks_per_note_type == other._end_superclocks_per_note_type &&
_note_type == other._note_type && _note_type == other._note_type &&
_active == other._active &&
_locked_to_meter == other._locked_to_meter && _locked_to_meter == other._locked_to_meter &&
_continuing == other._continuing; _continuing == other._continuing;
} }
@ -280,7 +274,6 @@ class LIBTEMPORAL_API Tempo {
return _superclocks_per_note_type != other._superclocks_per_note_type || return _superclocks_per_note_type != other._superclocks_per_note_type ||
_end_superclocks_per_note_type != other._end_superclocks_per_note_type || _end_superclocks_per_note_type != other._end_superclocks_per_note_type ||
_note_type != other._note_type || _note_type != other._note_type ||
_active != other._active ||
_locked_to_meter != other._locked_to_meter || _locked_to_meter != other._locked_to_meter ||
_continuing != other._continuing; _continuing != other._continuing;
} }
@ -296,7 +289,6 @@ class LIBTEMPORAL_API Tempo {
uint64_t _super_note_type_per_second; uint64_t _super_note_type_per_second;
uint64_t _end_super_note_type_per_second; uint64_t _end_super_note_type_per_second;
int8_t _note_type; int8_t _note_type;
bool _active;
bool _locked_to_meter; /* XXX name has unclear meaning with nutempo */ bool _locked_to_meter; /* XXX name has unclear meaning with nutempo */
bool _continuing; bool _continuing;
@ -1165,7 +1157,6 @@ class /*LIBTEMPORAL_API*/ TempoMap : public PBD::StatefulDestructible
double end_note_types_per_minute; double end_note_types_per_minute;
double note_type; double note_type;
bool continuing; /* "clamped" in actual legacy stuff */ bool continuing; /* "clamped" in actual legacy stuff */
bool active;
}; };
struct LegacyMeterState struct LegacyMeterState