1
0
mirror of git://projects.qi-hardware.com/gmenu2x.git synced 2024-11-26 10:04:05 +02:00

Removed checks for manuals and screenshots in JPEG and BMP format

Support for loading JPEG and BMP images was removed a long time ago,
so there is no point in looking for files in those formats.
This commit is contained in:
Maarten ter Huurne 2013-08-14 13:30:17 +02:00
parent 666be4d354
commit 8472acc26c
3 changed files with 1 additions and 10 deletions

View File

@ -429,8 +429,7 @@ void LinkApp::showManual() {
return; return;
// Png manuals // Png manuals
string ext8 = manual.substr(manual.size()-8,8); if (manual.substr(manual.size()-8,8)==".man.png") {
if (ext8==".man.png" || ext8==".man.bmp" || ext8==".man.jpg" || manual.substr(manual.size()-9,9)==".man.jpeg") {
#ifdef ENABLE_CPUFREQ #ifdef ENABLE_CPUFREQ
//Raise the clock to speed-up the loading of the manual //Raise the clock to speed-up the loading of the manual
gmenu2x->setSafeMaxClock(); gmenu2x->setSafeMaxClock();

View File

@ -456,12 +456,6 @@ bool Menu::addLink(string path, string file, string section) {
string manual = ""; string manual = "";
if (fileExists(exename+".man.png")) { if (fileExists(exename+".man.png")) {
manual = exename+".man.png"; manual = exename+".man.png";
} else if (fileExists(exename+".man.jpg")) {
manual = exename+".man.jpg";
} else if (fileExists(exename+".man.jpeg")) {
manual = exename+".man.jpeg";
} else if (fileExists(exename+".man.bmp")) {
manual = exename+".man.bmp";
} else if (fileExists(exename+".man.txt")) { } else if (fileExists(exename+".man.txt")) {
manual = exename+".man.txt"; manual = exename+".man.txt";
} else { } else {

View File

@ -279,8 +279,6 @@ void Selector::prepare(FileLister *fl, vector<string> *screens, vector<string> *
if (fileExists(screendir+noext+".png")) if (fileExists(screendir+noext+".png"))
screens->at(i) = screendir+noext+".png"; screens->at(i) = screendir+noext+".png";
else if (fileExists(screendir+noext+".jpg"))
screens->at(i) = screendir+noext+".jpg";
else else
screens->at(i) = ""; screens->at(i) = "";
} }