diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-07-22 16:08:11 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-07-22 16:08:11 +0000 |
| commit | c11c01ef200ce01ec454ff1d8023732d2cd6b06e (patch) | |
| tree | 416db0a1caa4800d24226993fc1193db7e93934c /libs/ardour/route.cc | |
| parent | 1c1b359ff21aac57bd71d291049d657f66cf31f5 (diff) | |
remove a bunch of uses of long (mostly replaced by int32_t)
git-svn-id: svn://localhost/ardour2/branches/3.0@7472 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/route.cc')
| -rw-r--r-- | libs/ardour/route.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index daabf8a56f..bd8abae88b 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -213,7 +213,7 @@ Route::remote_control_id() const return _remote_control_id; } -long +int32_t Route::order_key (std::string const & name) const { OrderKeys::const_iterator i = order_keys.find (name); @@ -225,7 +225,7 @@ Route::order_key (std::string const & name) const } void -Route::set_order_key (std::string const & name, long n) +Route::set_order_key (std::string const & name, int32_t n) { bool changed = false; @@ -267,7 +267,7 @@ Route::sync_order_keys (std::string const & base) } OrderKeys::iterator i; - uint32_t key; + int32_t key; if ((i = order_keys.find (base)) == order_keys.end()) { /* key doesn't exist, use the first existing key (during session initialization) */ @@ -1890,7 +1890,7 @@ Route::_set_state (const XMLNode& node, int version, bool /*call_base*/) if ((prop = node.property (X_("order-keys"))) != 0) { - long n; + int32_t n; string::size_type colon, equal; string remaining = prop->value(); @@ -1901,7 +1901,7 @@ Route::_set_state (const XMLNode& node, int version, bool /*call_base*/) error << string_compose (_("badly formed order key string in state file! [%1] ... ignored."), remaining) << endmsg; } else { - if (sscanf (remaining.substr (equal+1).c_str(), "%ld", &n) != 1) { + if (sscanf (remaining.substr (equal+1).c_str(), "%d", &n) != 1) { error << string_compose (_("badly formed order key string in state file! [%1] ... ignored."), remaining) << endmsg; } else { @@ -2066,7 +2066,7 @@ Route::_set_state_2X (const XMLNode& node, int version) if ((prop = node.property (X_("order-keys"))) != 0) { - long n; + int32_t n; string::size_type colon, equal; string remaining = prop->value(); @@ -2077,7 +2077,7 @@ Route::_set_state_2X (const XMLNode& node, int version) error << string_compose (_("badly formed order key string in state file! [%1] ... ignored."), remaining) << endmsg; } else { - if (sscanf (remaining.substr (equal+1).c_str(), "%ld", &n) != 1) { + if (sscanf (remaining.substr (equal+1).c_str(), "%d", &n) != 1) { error << string_compose (_("badly formed order key string in state file! [%1] ... ignored."), remaining) << endmsg; } else { |