Funkwhale/strawberry-audio-player-windows-mac-linux
1
0
Fork 0
mirror of https://github.com/strawberrymusicplayer/strawberry synced 2024-12-18 11:39:31 +01:00
Code Issues Releases Wiki Activity

Fix some compile warnings

Browse Source
This commit is contained in:
Jonas Kvinge 2020-07-13 18:11:57 +02:00
parent bcc5450aef
commit 614a09db1d
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
3rdparty/taglib/mp4/mp4item.cpp vendored
View File

@ -57,7 +57,7 @@ class MP4::Item::ItemPrivate {
explicit ItemPrivate() : data(new ItemData()) { explicit ItemPrivate() : data(new ItemData()) {
data->valid = true; data->valid = true;
data->atomDataType = MP4::TypeUndefined; data->atomDataType = MP4::TypeUndefined;
data->type = MP4::Item::TypeUndefined; data->type = MP4::Item::TypeUndefined_;
} }
std::shared_ptr<ItemData> data; std::shared_ptr<ItemData> data;
@ -207,7 +207,7 @@ String MP4::Item::toString() const {
desc.append(Utils::formatString("[%d bytes of data]", static_cast<int>(d->data->m_coverArtList[i].data().size()))); desc.append(Utils::formatString("[%d bytes of data]", static_cast<int>(d->data->m_coverArtList[i].data().size())));
} }
return desc.toString(", "); return desc.toString(", ");
case TypeUndefined: case TypeUndefined_:
return "[unknown]"; return "[unknown]";
} }
return String(); return String();

2
3rdparty/taglib/mp4/mp4item.h vendored
View File

@ -41,7 +41,7 @@ class TAGLIB_EXPORT Item {
}; };
enum ItemType { enum ItemType {
TypeUndefined = 0, TypeUndefined_ = 0,
TypeBool, TypeBool,
TypeInt, TypeInt,
TypeIntPair, TypeIntPair,

2
src/core/macfslistener.mm
View File

@ -49,7 +49,7 @@ void MacFSListener::EventStreamCallback(ConstFSEventStreamRef stream, void* user
MacFSListener* me = reinterpret_cast<MacFSListener*>(user_data); MacFSListener* me = reinterpret_cast<MacFSListener*>(user_data);
char** paths = reinterpret_cast<char**>(event_paths); char** paths = reinterpret_cast<char**>(event_paths);
for (int i = 0; i < num_events; ++i) { for (size_t i = 0; i < num_events; ++i) {
QString path = QString::fromUtf8(paths[i]); QString path = QString::fromUtf8(paths[i]);
qLog(Debug) << "Something changed at:" << path; qLog(Debug) << "Something changed at:" << path;
while (path.endsWith('/')) { while (path.endsWith('/')) {

6
src/device/macosdevicelister.mm
View File

@ -533,10 +533,10 @@ void MacOsDeviceLister::USBDeviceAddedCallback(void* refcon, io_iterator_t it) {
device.address = [addr intValue]; device.address = [addr intValue];
// First check the libmtp device list. // First check the libmtp device list.
QSet<MTPDevice>::const_iterator it = sMTPDeviceList.find(device); QSet<MTPDevice>::const_iterator it2 = sMTPDeviceList.find(device);
if (it != sMTPDeviceList.end()) { if (it2 != sMTPDeviceList.end()) {
// Fill in quirks flags from libmtp. // Fill in quirks flags from libmtp.
device.quirks = it->quirks; device.quirks = it2->quirks;
me->FoundMTPDevice(device, GetSerialForMTPDevice(object)); me->FoundMTPDevice(device, GetSerialForMTPDevice(object));
continue; continue;
} }

2
src/engine/macosdevicefinder.cpp
View File

@ -81,7 +81,7 @@ QList<DeviceFinder::Device> MacOsDeviceFinder::ListDevices() {
if (!devices.get()) { if (!devices.get()) {
return ret; return ret;
} }
const int device_count = device_size_bytes / sizeof(AudioDeviceID); const UInt32 device_count = device_size_bytes / sizeof(AudioDeviceID);
address.mScope = kAudioDevicePropertyScopeOutput; address.mScope = kAudioDevicePropertyScopeOutput;
for (UInt32 i = 0; i < device_count; ++i) { for (UInt32 i = 0; i < device_count; ++i) {