diff options
Diffstat (limited to 'rbutil')
-rw-r--r-- | rbutil/rbutilqt/base/autodetection.cpp | 5 | ||||
-rw-r--r-- | rbutil/rbutilqt/configure.cpp | 14 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutil.ini | 75 |
3 files changed, 82 insertions, 12 deletions
diff --git a/rbutil/rbutilqt/base/autodetection.cpp b/rbutil/rbutilqt/base/autodetection.cpp index e6819992cf..b038aa683d 100644 --- a/rbutil/rbutilqt/base/autodetection.cpp +++ b/rbutil/rbutilqt/base/autodetection.cpp | |||
@@ -418,8 +418,9 @@ bool Autodetection::detectUsb() | |||
418 | qDebug() << "[USB] detected problem with player" << m_errdev; | 418 | qDebug() << "[USB] detected problem with player" << m_errdev; |
419 | return true; | 419 | return true; |
420 | } | 420 | } |
421 | if(usbincompat.contains(attached.at(i))) { | 421 | QString idstring = QString("%1").arg(attached.at(i), 8, 16, QChar('0')); |
422 | m_incompat = usbincompat.value(attached.at(i)); | 422 | if(!RbSettings::platformValue(idstring, RbSettings::CurName).toString().isEmpty()) { |
423 | m_incompat = idstring; | ||
423 | qDebug() << "[USB] detected incompatible player" << m_incompat; | 424 | qDebug() << "[USB] detected incompatible player" << m_incompat; |
424 | return true; | 425 | return true; |
425 | } | 426 | } |
diff --git a/rbutil/rbutilqt/configure.cpp b/rbutil/rbutilqt/configure.cpp index 43406c00e7..857242a60c 100644 --- a/rbutil/rbutilqt/configure.cpp +++ b/rbutil/rbutilqt/configure.cpp | |||
@@ -588,14 +588,12 @@ void Config::autodetect() | |||
588 | } | 588 | } |
589 | if(!detector.incompatdev().isEmpty()) { | 589 | if(!detector.incompatdev().isEmpty()) { |
590 | QString text; | 590 | QString text; |
591 | // we need to set the platform here to get the brand from the | 591 | text = tr("Detected an unsupported player:\n%1\n" |
592 | // settings object | 592 | "Sorry, Rockbox doesn't run on your player.") |
593 | RbSettings::setValue(RbSettings::Platform, detector.incompatdev()); | 593 | .arg(RbSettings::platformValue(detector.incompatdev(), |
594 | text = tr("Detected an unsupported %1 player variant. Sorry, " | 594 | RbSettings::CurName).toString()); |
595 | "Rockbox doesn't run on your player.") | 595 | |
596 | .arg(RbSettings::value(RbSettings::CurBrand).toString()); | 596 | QMessageBox::critical(this, tr("Fatal: player incompatible"), |
597 | |||
598 | QMessageBox::critical(this, tr("Fatal error: incompatible player found"), | ||
599 | text, QMessageBox::Ok); | 597 | text, QMessageBox::Ok); |
600 | return; | 598 | return; |
601 | } | 599 | } |
diff --git a/rbutil/rbutilqt/rbutil.ini b/rbutil/rbutilqt/rbutil.ini index cb8032b789..739a5d2be4 100644 --- a/rbutil/rbutilqt/rbutil.ini +++ b/rbutil/rbutilqt/rbutil.ini | |||
@@ -251,7 +251,6 @@ bootloadermethod=ipod | |||
251 | bootloadername=/ipod/bootloader-ipodnano.ipod | 251 | bootloadername=/ipod/bootloader-ipodnano.ipod |
252 | manualname= | 252 | manualname= |
253 | brand=Apple | 253 | brand=Apple |
254 | usbincompat=0x05ac1260, 0x05ac1262, 0x05ac1263 | ||
255 | configure_modelname=ipodnano | 254 | configure_modelname=ipodnano |
256 | targetid=14 | 255 | targetid=14 |
257 | encoder=rbspeex | 256 | encoder=rbspeex |
@@ -286,7 +285,6 @@ bootloadername=/ipod/bootloader-ipodvideo.ipod | |||
286 | manualname= | 285 | manualname= |
287 | brand=Apple | 286 | brand=Apple |
288 | configure_modelname=ipodvideo | 287 | configure_modelname=ipodvideo |
289 | usbincompat=0x05ac1261 | ||
290 | targetid=15 | 288 | targetid=15 |
291 | encoder=rbspeex | 289 | encoder=rbspeex |
292 | 290 | ||
@@ -522,6 +520,79 @@ configure_modelname=yh925 | |||
522 | targetid=59 | 520 | targetid=59 |
523 | encoder=rbspeex | 521 | encoder=rbspeex |
524 | 522 | ||
523 | [05ac1260] | ||
524 | name=Apple Ipod Nano (Second Generation) | ||
525 | |||
526 | [05ac1240] | ||
527 | name=Apple Ipod Nano (Second Generation, DFU Mode) | ||
528 | |||
529 | [05ac1262] | ||
530 | name=Apple Ipod Nano (Third Generation) | ||
531 | |||
532 | [05ac1263] | ||
533 | name=Apple Ipod Nano (Fourth Generation) | ||
534 | |||
535 | [05ac1255] | ||
536 | name=Apple Ipod Nano (Fourth Generation, DFU Mode) | ||
537 | |||
538 | [05ac1261] | ||
539 | name=Apple Ipod Classic (6th Generation) | ||
540 | |||
541 | [041e4133] | ||
542 | name=Creative Zen series (Removable Disk Mode) | ||
543 | |||
544 | [041e4151] | ||
545 | name=Creative Zen Vision:M (MTP) | ||
546 | |||
547 | [041e4150] | ||
548 | name=Creative Zen V (MTP) | ||
549 | |||
550 | [041e4152] | ||
551 | name=Creative Zen V Plus (MTP) | ||
552 | |||
553 | [066f3600] | ||
554 | name=Creative Zen V (HW recovery mode) | ||
555 | |||
556 | [041e4157] | ||
557 | name=Creative ZEN (MTP) | ||
558 | |||
559 | [041e4128] | ||
560 | name=Creative NOMAD Jukebox Zen Xtra (MTP) | ||
561 | |||
562 | [041e4111] | ||
563 | name=Dell Digital Jukebox (First Generation, MTP) | ||
564 | |||
565 | [041e412f] | ||
566 | name=Dell Digital Jukebox (Second Generation, MTP) | ||
567 | |||
568 | [09300014] | ||
569 | name=Toshiba Gigabeat V Series, MTP | ||
570 | |||
571 | [09300019] | ||
572 | name=Toshiba Gigabeat T Series, MTP (No UMS mode) | ||
573 | |||
574 | [07817480] | ||
575 | name=Sansa Connect (Normal Connection) | ||
576 | |||
577 | [07817481] | ||
578 | name=Sansa Connect (Recovery Mode) | ||
579 | |||
580 | [07817400] | ||
581 | name=Sansa m200-tcc (UMS/MSC) | ||
582 | |||
583 | [07817401] | ||
584 | name=Sansa m200-tcc (MTP) | ||
585 | |||
586 | [07817430] | ||
587 | name=Sansa m200v4 (MTP) | ||
588 | |||
589 | [07817431] | ||
590 | name=Sansa m200v4 (MSC) | ||
591 | |||
592 | [078174b1] | ||
593 | name=Sansa View | ||
594 | |||
595 | |||
525 | [languages] | 596 | [languages] |
526 | lang1=afrikaans | 597 | lang1=afrikaans |
527 | lang2=bulgarian | 598 | lang2=bulgarian |