diff options
| author | Alejandro Marzini | 2010-07-13 04:31:15 +0000 |
|---|---|---|
| committer | Alejandro Marzini | 2010-07-13 04:31:15 +0000 |
| commit | 609e08d5dbae3179eddf981abe73d69009432de4 (patch) | |
| tree | cddbd0a0e69eaa53b85f98f96dc410a307773f08 /sound/musicplugin.cpp | |
| parent | 8b6a670391f1b5103e3761d78eef8f41d64cf8cd (diff) | |
| parent | 03c0faa5d76f547603ee6389cdf958e2a6f0f43d (diff) | |
| download | scummvm-rg350-609e08d5dbae3179eddf981abe73d69009432de4.tar.gz scummvm-rg350-609e08d5dbae3179eddf981abe73d69009432de4.tar.bz2 scummvm-rg350-609e08d5dbae3179eddf981abe73d69009432de4.zip | |
Merged from trunk, from Rev 49499 to HEAD
svn-id: r50840
Diffstat (limited to 'sound/musicplugin.cpp')
| -rw-r--r-- | sound/musicplugin.cpp | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/sound/musicplugin.cpp b/sound/musicplugin.cpp index b4754230da..8078094616 100644 --- a/sound/musicplugin.cpp +++ b/sound/musicplugin.cpp @@ -24,10 +24,12 @@ */ #include "sound/musicplugin.h" +#include "common/hash-str.h" +#include "common/translation.h" MusicDevice::MusicDevice(MusicPluginObject const *musicPlugin, Common::String name, MusicType mt) : - _musicDriverName(musicPlugin->getName()), _musicDriverId(musicPlugin->getId()), - _name(name), _type(mt) { + _musicDriverName(_(musicPlugin->getName())), _musicDriverId(musicPlugin->getId()), + _name(_(name)), _type(mt) { } Common::String MusicDevice::getCompleteName() { @@ -46,3 +48,17 @@ Common::String MusicDevice::getCompleteName() { return name; } + +Common::String MusicDevice::getCompleteId() { + Common::String id = _musicDriverId; + if (!_name.empty()) { + id += "_"; + id += _name; + } + + return id; +} + +MidiDriver::DeviceHandle MusicDevice::getHandle() { + return (MidiDriver::DeviceHandle)Common::hashit(getCompleteId().c_str()); +} |