Ticket #2940: banners.patch
File banners.patch, 3.3 KB (added by , 17 years ago) |
---|
-
playbackbox.cpp
1151 1151 } 1152 1152 } 1153 1153 1154 void PlaybackBoxMusic::bannerEnable( Metadata *mdata)1154 void PlaybackBoxMusic::bannerEnable(QString text, int millis) 1155 1155 { 1156 1156 if (visualizer_status != 2) 1157 1157 return; 1158 1158 1159 banner_timer->start(8000); 1160 mainvisual->addInformation("\"" + mdata->Title() + "\"\n" + 1161 mdata->Artist() + " - " + mdata->Album()); 1159 banner_timer->start(millis); 1160 mainvisual->addInformation(text); 1162 1161 } 1163 1162 1163 void PlaybackBoxMusic::bannerEnable(Metadata *mdata) 1164 { 1165 bannerEnable("\"" + mdata->Title() + "\"\n" + 1166 mdata->Artist() + " - " + mdata->Album(), 8000); 1167 } 1168 1164 1169 void PlaybackBoxMusic::bannerToggle(Metadata *mdata) 1165 1170 { 1166 1171 if (banner_timer->isActive()) … … 1233 1238 mainvisual->setVisual("Blank"); 1234 1239 mainvisual->setVisual(new_visualizer); 1235 1240 } 1241 1242 bannerEnable(tr("Visualization: ") + new_visualizer, 4000); 1236 1243 } 1237 1244 1238 1245 void PlaybackBoxMusic::setTrackOnLCD(Metadata *mdata) … … 1444 1451 1445 1452 if (class LCD *lcd = LCD::Get()) 1446 1453 lcd->setMusicShuffle(LCD::MUSIC_SHUFFLE_SMART); 1454 1455 bannerEnable(tr("Shuffle: Smart"), 4000); 1447 1456 break; 1448 1457 case SHUFFLE_RANDOM: 1449 1458 if(shuffle_button) … … 1457 1466 1458 1467 if (class LCD *lcd = LCD::Get()) 1459 1468 lcd->setMusicShuffle(LCD::MUSIC_SHUFFLE_RAND); 1469 1470 bannerEnable(tr("Shuffle: Rand"), 4000); 1460 1471 break; 1461 1472 case SHUFFLE_ALBUM: 1462 1473 if(shuffle_button) … … 1470 1481 1471 1482 if (class LCD *lcd = LCD::Get()) 1472 1483 lcd->setMusicShuffle(LCD::MUSIC_SHUFFLE_ALBUM); 1484 1485 bannerEnable(tr("Shuffle: Album"), 4000); 1473 1486 break; 1474 1487 default: 1475 1488 if(shuffle_button) … … 1483 1496 1484 1497 if (class LCD *lcd = LCD::Get()) 1485 1498 lcd->setMusicShuffle(LCD::MUSIC_SHUFFLE_NONE); 1499 1500 bannerEnable(tr("Shuffle: None"), 4000); 1486 1501 break; 1487 1502 } 1488 1503 music_tree_list->setTreeOrdering(shufflemode + 1); … … 1547 1562 1548 1563 if (class LCD *lcd = LCD::Get()) 1549 1564 lcd->setMusicRepeat (LCD::MUSIC_REPEAT_ALL); 1565 1566 bannerEnable(tr("Repeat: All"), 4000); 1550 1567 break; 1551 1568 case REPEAT_TRACK: 1552 1569 if (keyboard_accelerators) … … 1556 1573 1557 1574 if (class LCD *lcd = LCD::Get()) 1558 1575 lcd->setMusicRepeat (LCD::MUSIC_REPEAT_TRACK); 1576 1577 bannerEnable(tr("Repeat: Track"), 4000); 1559 1578 break; 1560 1579 default: 1561 1580 if (keyboard_accelerators) … … 1565 1584 1566 1585 if (class LCD *lcd = LCD::Get()) 1567 1586 lcd->setMusicRepeat (LCD::MUSIC_REPEAT_NONE); 1587 1588 bannerEnable(tr("Repeat: None"), 4000); 1568 1589 break; 1569 1590 } 1570 1591 } -
playbackbox.h
110 110 void openOutputDevice(void); 111 111 void postUpdate(); 112 112 void playFirstTrack(); 113 void bannerEnable(QString text, int millis); 113 114 void bannerEnable(Metadata *mdata); 114 115 void bannerToggle(Metadata *mdata); 115 116