mirror of
https://github.com/libretro/scummvm.git
synced 2024-12-15 14:18:37 +00:00
68d01321d6
This commit addresses a range of changes, within scummvm subproject. - Audio files, like mididrv, remove U32String based name and identifier, because ASCII only. - mididrv.cpp had some wrong format for warning messages, fix those - Message dialogs were modified to use default arguments more often, but reverting back to the orignal to minimize changes. - SetTooltip has a fake constructor that takes in a string, and use it. - U32Format had some break statements missing, add those. - RemapWidget: Use fake constructor for setLabel and setTooltip, to make minimal changes - SDL: setting text in clipboard no longer uses SDL_iconv_string - TTS: Override base class "say" with strings, so tts->say can be used with normal strings too. - About dialog: fix incorrect code for u32string variables - Fix some extra brackets - Some buttons were incorrectly removed from using translated labels, revert those - Message Dialog: Pass default and alt buttons as const references - Saveload Dialog: Use translations in missing places, use const-references. Also, use translations in a correct manner. - Use const references for tooltip in GraphicsWidget, EditTextWidget, error.cpp - DomainEditTextWidget: Use U32String for text
62 lines
1.8 KiB
C++
62 lines
1.8 KiB
C++
/* ScummVM - Graphic Adventure Engine
|
|
*
|
|
* ScummVM is the legal property of its developers, whose names
|
|
* are too numerous to list here. Please refer to the COPYRIGHT
|
|
* file distributed with this source distribution.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*
|
|
*/
|
|
|
|
#include "audio/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) {
|
|
}
|
|
|
|
Common::String MusicDevice::getCompleteName() {
|
|
Common::String name;
|
|
|
|
if (_name.empty()) {
|
|
// Default device, just show the driver name
|
|
name = _musicDriverName;
|
|
} else {
|
|
// Show both device and driver names
|
|
name = _name;
|
|
name += " [";
|
|
name += _musicDriverName;
|
|
name += "]";
|
|
}
|
|
|
|
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());
|
|
}
|