diff options
| author | Carl Hetherington <carl@carlh.net> | 2010-07-01 01:14:14 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2010-07-01 01:14:14 +0000 |
| commit | 92e412661772e6b9c83109b7ee4996f4c040d3f4 (patch) | |
| tree | 1f1006c61d03b6b68855d812561d931606ff84b3 /libs/ardour/ardour | |
| parent | aad230da6937358b11976c1db3986575b2e412a0 (diff) | |
Allow port matrix to show both audio and midi ports at the same time, and use that facility for route IO selectors.
git-svn-id: svn://localhost/ardour2/branches/3.0@7344 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/data_type.h | 10 | ||||
| -rw-r--r-- | libs/ardour/ardour/io.h | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/libs/ardour/ardour/data_type.h b/libs/ardour/ardour/data_type.h index 36114b29a9..07ba7c60ef 100644 --- a/libs/ardour/ardour/data_type.h +++ b/libs/ardour/ardour/data_type.h @@ -23,6 +23,8 @@ #include <string> #include <jack/jack.h> +#include "i18n.h" + namespace ARDOUR { @@ -88,6 +90,14 @@ public: } } + const char* to_i18n_string() const { + switch (_symbol) { + case AUDIO: return _("audio"); + case MIDI: return _("MIDI"); + default: return _("unknown"); + } + } + inline operator uint32_t() const { return (uint32_t)_symbol; } /** DataType iterator, for writing generic loops that iterate over all diff --git a/libs/ardour/ardour/io.h b/libs/ardour/ardour/io.h index 72815c17cc..7475dbb203 100644 --- a/libs/ardour/ardour/io.h +++ b/libs/ardour/ardour/io.h @@ -218,7 +218,7 @@ class IO : public SessionObject, public Latent int32_t find_port_hole (const char* base); void setup_bundle (); - std::string bundle_channel_name (uint32_t, uint32_t) const; + std::string bundle_channel_name (uint32_t, uint32_t, DataType) const; }; } // namespace ARDOUR |