tsiry-sandratraina.com / rockbox-zig
Rockbox open source high quality audio player as a Music Player Daemon
mpris rockbox mpd libadwaita audio rust zig deno
2
fork

Configure Feed

Select the types of activity you want to include in your feed.

rbutil: Fix various warnings.

Replace use of deprecated APIs with their replacements, and fix some
other minor warnings.

Change-Id: I3f63e0bd91b96ce86ce39c087fe0040fc226d16d

Dominik Riebeling 9cd37337 b1332d97

+11 -10
+1 -1
rbutil/rbutilqt/base/encoderexe.cpp
··· 78 78 execstring.replace("%output",output); 79 79 LOG_INFO() << "cmd: " << execstring; 80 80 int result = QProcess::execute(execstring); 81 - return (result == 0) ? true : false; 81 + return result == 0; 82 82 } 83 83 84 84
+3 -3
rbutil/rbutilqt/base/system.cpp
··· 235 235 /** @brief detect devices based on usb pid / vid. 236 236 * @return list with usb VID / PID values. 237 237 */ 238 - QMap<uint32_t, QString> System::listUsbDevices(void) 238 + QMultiMap<uint32_t, QString> System::listUsbDevices(void) 239 239 { 240 - QMap<uint32_t, QString> usbids; 240 + QMultiMap<uint32_t, QString> usbids; 241 241 // usb pid detection 242 242 LOG_INFO() << "Searching for USB devices"; 243 243 #if defined(Q_OS_LINUX) ··· 272 272 if(name.isEmpty()) 273 273 name = tr("(no description available)"); 274 274 if(id) { 275 - usbids.insertMulti(id, name); 275 + usbids.insert(id, name); 276 276 LOG_INFO("USB: 0x%08x, %s", id, name.toLocal8Bit().data()); 277 277 } 278 278 }
+2 -1
rbutil/rbutilqt/base/system.h
··· 26 26 27 27 #include <inttypes.h> 28 28 29 + #include <QMultiMap> 29 30 #include <QString> 30 31 #include <QUrl> 31 32 ··· 43 44 static QString userName(void); 44 45 static QString osVersionString(void); 45 46 static QList<uint32_t> listUsbIds(void); 46 - static QMap<uint32_t, QString> listUsbDevices(void); 47 + static QMultiMap<uint32_t, QString> listUsbDevices(void); 47 48 48 49 static QUrl systemProxy(void); 49 50
+1 -1
rbutil/rbutilqt/base/utils.cpp
··· 23 23 #include "systeminfo.h" 24 24 #include "Logger.h" 25 25 26 - #ifdef UNICODE 26 + #if !defined(_UNICODE) 27 27 #define _UNICODE 28 28 #endif 29 29
+2 -2
rbutil/rbutilqt/configure.cpp
··· 350 350 else 351 351 platformList = SystemInfo::platforms(SystemInfo::PlatformAll); 352 352 353 - QMap <QString, QString> manuf; 353 + QMultiMap <QString, QString> manuf; 354 354 for(int it = 0; it < platformList.size(); it++) 355 355 { 356 356 QString curbrand = SystemInfo::platformValue(platformList.at(it), 357 357 SystemInfo::CurBrand).toString(); 358 - manuf.insertMulti(curbrand, platformList.at(it)); 358 + manuf.insert(curbrand, platformList.at(it)); 359 359 } 360 360 361 361 // set up devices table
+1 -1
rbutil/rbutilqt/rbutilqt.cpp
··· 55 55 #include <stdio.h> 56 56 #endif 57 57 #if defined(Q_OS_WIN32) 58 - #if defined(UNICODE) 58 + #if !defined(_UNICODE) 59 59 #define _UNICODE 60 60 #endif 61 61 #include <stdio.h>
+1 -1
rbutil/rbutilqt/sysinfo.cpp
··· 48 48 info += tr("<b>Permissions</b><br/>%1<hr/>").arg(System::userPermissionsString()); 49 49 #endif 50 50 info += tr("<b>Attached USB devices</b><br/>"); 51 - QMap<uint32_t, QString> usbids = System::listUsbDevices(); 51 + QMultiMap<uint32_t, QString> usbids = System::listUsbDevices(); 52 52 QList<uint32_t> usbkeys = usbids.keys(); 53 53 for(int i = 0; i < usbkeys.size(); i++) { 54 54 info += tr("VID: %1 PID: %2, %3")