The-Homebrew-Cloud/homebrewfilter
2
0
Fork 0
mirror of https://gitlab.com/Nanolx/homebrewfilter.git synced 2024-11-24 18:16:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

exclude SD Card Gecko, GC Homebrew Stuff from vWii build

Browse Source
This commit is contained in:
Christopher Roy Bratusek 2013-01-01 09:57:02 +01:00
parent 1592d0b14b
commit d2c23bad8f
7 changed files with 94 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
main/source/Menus/menu_main.cpp
View File

@ -111,6 +111,7 @@ int MenuMain()
temp_sd_usb_active = Theme.dvd_active;
temp_sd_usb_inactive = Theme.dvd_inactive;
}
#ifndef VWII
else if(Settings.device == "gca")
{
temp_sd_usb_active = Theme.gca_active;
@ -121,6 +122,7 @@ int MenuMain()
temp_sd_usb_active = Theme.gcb_active;
temp_sd_usb_inactive = Theme.gcb_inactive;
}
#endif
else if(Settings.device == "all")
{
temp_sd_usb_active = Theme.all_active;
@ -128,10 +130,13 @@ int MenuMain()
}
// wii / gc ansicht
#ifndef VWII
if(Settings.system == 1)
{
#endif
temp_wii_gc_active = Theme.wii_active;
temp_wii_gc_inactive = Theme.wii_inactive;
#ifndef VWII
}
else if(Settings.system == 0)
{
@ -143,6 +148,7 @@ int MenuMain()
temp_wii_gc_active = Theme.wii_gc_active;
temp_wii_gc_inactive = Theme.wii_gc_inactive;
}
#endif
// Seite der zuletzt gestarteten app
if(Settings.last_app_pos != -1)
@ -308,7 +314,9 @@ int MenuMain()
wii_gc_Btn.SetPosition(-185, 375);
wii_gc_Btn.SetImage(&wii_gc_BtnImg);
wii_gc_Btn.SetImageOver(&wii_gc_BtnImgOver);
#ifndef VWII
wii_gc_Btn.SetTrigger(&trigA);
#endif
wii_gc_Btn.SetEffectGrow();
// normal / grid ansicht
@ -419,6 +427,7 @@ int MenuMain()
viewdevice = new GuiImage (new GuiImageData(Theme.dvd_inactive));
icon = true;
}
#ifndef VWII
else if(strncmp(vechomebrew_list_choice[i].foldername.c_str(), "gca", 3) == 0)
{
viewdevice = new GuiImage (new GuiImageData(Theme.gca_inactive));
@ -429,7 +438,7 @@ int MenuMain()
viewdevice = new GuiImage (new GuiImageData(Theme.gcb_inactive));
icon = true;
}
#endif
if(icon)
{
viewdevice->SetAlignment(ALIGN_RIGHT, ALIGN_TOP);
@ -740,8 +749,11 @@ int MenuMain()
else if(sd_usb_Btn.GetState() == STATE_CLICKED || Settings.sd_insert == -1 || Settings.sd_insert == 2
|| Settings.usb_insert == -1 || Settings.usb_insert == 2
|| Settings.dvd_insert == -1 || Settings.dvd_insert == 2
#ifndef VWII
|| Settings.gca_insert == -1 || Settings.gca_insert == 2
|| Settings.gcb_insert == -1 || Settings.gcb_insert == 2)
|| Settings.gcb_insert == -1 || Settings.gcb_insert == 2
#endif
)
{
int device = -1;
if(sd_usb_Btn.GetState() == STATE_CLICKED)
@ -755,18 +767,23 @@ int MenuMain()
Settings.device = "sd_usb";
else if(device == 4)
Settings.device = "dvd";
#ifndef VWII
else if(device == 5)
Settings.device = "gca";
else if(device == 6)
Settings.device = "gcb";
#endif
else if(device == 7)
Settings.device = "all";
if(device != -1 || Settings.sd_insert == -1 || Settings.sd_insert == 2
|| Settings.usb_insert == -1 || Settings.usb_insert == 2
|| Settings.dvd_insert == -1 || Settings.dvd_insert == 2
#ifndef VWII
|| Settings.gca_insert == -1 || Settings.gca_insert == 2
|| Settings.gcb_insert == -1 || Settings.gcb_insert == 2)
|| Settings.gcb_insert == -1 || Settings.gcb_insert == 2
#endif
)
{
check_device();
Settings.current_page = 1;
@ -775,7 +792,7 @@ int MenuMain()
else
sd_usb_Btn.ResetState();
}
#ifndef VWII
// Wii, GC
else if(wii_gc_Btn.GetState() == STATE_CLICKED)
{
@ -797,6 +814,7 @@ int MenuMain()
else
wii_gc_Btn.ResetState();
}
#endif
// Power button
else if(power_Btn.GetState() == STATE_CLICKED || WPAD_ButtonsDown(0) & (WPAD_BUTTON_HOME | WPAD_CLASSIC_BUTTON_HOME) || PAD_ButtonsDown(0) & PAD_BUTTON_START)

14
main/source/Prompts/prompt_device.cpp
View File

@ -43,10 +43,12 @@ int devicePrompt()
GuiImageData sd_usb_BtnImgDataOver(Theme.sd_usb_active);
GuiImageData dvd_BtnImgData(Theme.dvd_inactive);
GuiImageData dvd_BtnImgDataOver(Theme.dvd_active);
#ifndef VWII
GuiImageData gca_BtnImgData(Theme.gca_inactive);
GuiImageData gca_BtnImgDataOver(Theme.gca_active);
GuiImageData gcb_BtnImgData(Theme.gcb_inactive);
GuiImageData gcb_BtnImgDataOver(Theme.gcb_active);
#endif
GuiImageData all_BtnImgData(Theme.all_inactive);
GuiImageData all_BtnImgDataOver(Theme.all_active);
@ -55,8 +57,10 @@ int devicePrompt()
GuiImage usb_BtnImg(&usb_BtnImgData);
GuiImage sd_usb_BtnImg(&sd_usb_BtnImgData);
GuiImage dvd_BtnImg(&dvd_BtnImgData);
#ifndef VWII
GuiImage gca_BtnImg(&gca_BtnImgData);
GuiImage gcb_BtnImg(&gca_BtnImgData);
#endif
GuiImage all_BtnImg(&all_BtnImgData);
// button over
@ -95,7 +99,7 @@ int devicePrompt()
dvd_Btn.SetImage(&dvd_BtnImg);
dvd_Btn.SetImageOver(&dvd_BtnImgOver);
dvd_Btn.SetTrigger(&trigA);
#ifndef VWII
GuiButton gca_Btn(gca_BtnImgData.GetWidth(), gca_BtnImgData.GetHeight());
gca_Btn.SetAlignment(ALIGN_RIGHT, ALIGN_MIDDLE);
gca_Btn.SetPosition(-96, 0);
@ -109,7 +113,7 @@ int devicePrompt()
gcb_Btn.SetImage(&gcb_BtnImg);
gcb_Btn.SetImageOver(&gcb_BtnImgOver);
gcb_Btn.SetTrigger(&trigA);
#endif
GuiButton all_Btn(all_BtnImgData.GetWidth(), all_BtnImgData.GetHeight());
all_Btn.SetAlignment(ALIGN_RIGHT, ALIGN_MIDDLE);
all_Btn.SetPosition(-8, 0);
@ -125,8 +129,10 @@ int devicePrompt()
promptWindow.Append(&usb_Btn);
promptWindow.Append(&sd_usb_Btn);
promptWindow.Append(&dvd_Btn);
#ifndef VWII
promptWindow.Append(&gca_Btn);
promptWindow.Append(&gcb_Btn);
#endif
promptWindow.Append(&all_Btn);
promptWindow.Append(&back);
@ -163,7 +169,7 @@ int devicePrompt()
device = 4;
stop = true;
}
#ifndef VWII
if(gca_Btn.GetState() == STATE_CLICKED)
{
device = 5;
@ -175,7 +181,7 @@ int devicePrompt()
device = 6;
stop = true;
}
#endif
if(all_Btn.GetState() == STATE_CLICKED)
{
device = 7;

18
main/source/Tools/app_list.cpp
View File

@ -127,8 +127,12 @@ void app_list()
vechomebrew_list_category[0].clear();
if(Settings.device == "sd1" || Settings.device == "usb1" || Settings.device == "dvd"
|| Settings.device == "gca" || Settings.device == "gcb")
#ifndef VWII
|| Settings.device == "gca" || Settings.device == "gcb"
#endif
)
{
#ifndef VWII
if(Settings.system == 1)
add(Settings.device, "apps/");
else if(Settings.system == 0)
@ -138,6 +142,9 @@ void app_list()
add(Settings.device, "apps/");
add(Settings.device, "gc_apps/");
}
#else
add(Settings.device, "apps/");
#endif
}
else if(Settings.device == "sd_usb")
{
@ -146,17 +153,21 @@ void app_list()
add("sd1", "apps/");
add("usb1", "apps/");
}
#ifndef VWII
else if(Settings.system == 0)
{
add("sd1", "gc_apps/");
add("usb1", "gc_apps/");
}
#endif
else if(Settings.system == 2)
{
add("sd1", "apps/");
add("sd1", "gc_apps/");
add("usb1", "apps/");
#ifndef VWII
add("sd1", "gc_apps/");
add("usb1", "gc_apps/");
#endif
}
}
else if(Settings.device == "all")
@ -166,8 +177,10 @@ void app_list()
add("sd1", "apps/");
add("usb1", "apps/");
add("dvd", "apps/");
#ifndef VWII
add("gca", "apps/");
add("gcb", "apps/");
}
else if(Settings.system == 0)
{
@ -189,6 +202,7 @@ void app_list()
add("gca", "gc_apps/");
add("gcb", "apps/");
add("gcb", "gc_apps/");
#endif
}
}

30
main/source/Tools/copy_app_in_category.cpp
View File

@ -19,12 +19,19 @@ void copy_app_in_unassigned()
// Geräte SD, USB
if(Settings.device == "sd1" || Settings.device == "usb1" || Settings.device == "dvd"
|| Settings.device == "gca" || Settings.device == "gcb")
#ifndef VWII
|| Settings.device == "gca" || Settings.device == "gcb"
#endif
)
anzahl_device = 1;
else if(Settings.device == "sd_usb")
anzahl_device = 2;
else if(Settings.device == "all")
#ifndef VWII
anzahl_device = 5;
#else
anzahl_device = 3;
#endif
// Ordner APPS, GC_APPS
if(Settings.system == 1 || Settings.system == 0)
@ -39,6 +46,7 @@ void copy_app_in_unassigned()
for(int a = 0; a < (signed)apps.size(); a++)
{
string foldername, ordner;
#ifndef VWII
if(Settings.system == 1)
ordner = ":/apps/";
else if(Settings.system == 0)
@ -47,6 +55,9 @@ void copy_app_in_unassigned()
ordner = ":/apps/";
else if(Settings.system == 2 && y == 1)
ordner = ":/gc_apps/";
#else
ordner = ":/apps/";
#endif
if(anzahl_device == 1)
foldername = Settings.device + ordner + apps[a] + "/";
@ -58,10 +69,12 @@ void copy_app_in_unassigned()
foldername = "usb1" + ordner + apps[a] + "/";
else if(x == 2)
foldername = "dvd" + ordner + apps[a] + "/";
#ifndef VWII
else if(x == 3)
foldername = "gca" + ordner + apps[a] + "/";
else if(x == 4)
foldername = "gcb" + ordner + apps[a] + "/";
#endif
}
}
}
@ -95,12 +108,19 @@ void copy_app_in_category(int category) //Apps im Kategorie kopieren
// Geräte SD, USB
if(Settings.device == "sd1" || Settings.device == "usb1" || Settings.device == "dvd"
|| Settings.device == "gca" || Settings.device == "gcb")
#ifndef VWII
|| Settings.device == "gca" || Settings.device == "gcb"
#endif
)
anzahl_device = 1;
else if(Settings.device == "sd_usb")
anzahl_device = 2;
else if(Settings.device == "all")
#ifndef VWII
anzahl_device = 5;
#else
anzahl_device = 3;
#endif
// Ordner APPS, GC_APPS
if(Settings.system == 1 || Settings.system == 0)
@ -113,6 +133,7 @@ void copy_app_in_category(int category) //Apps im Kategorie kopieren
for(int y = 0; y < anzahl_ordner; y++ )
{
string foldername, ordner;
#ifndef VWII
if(Settings.system == 1)
ordner = ":/apps/";
else if(Settings.system == 0)
@ -121,6 +142,9 @@ void copy_app_in_category(int category) //Apps im Kategorie kopieren
ordner = ":/apps/";
else if(Settings.system == 2 && y == 1)
ordner = ":/gc_apps/";
#else
ordner = ":/apps/";
#endif
if(anzahl_device == 1)
foldername = Settings.device + ordner + AvailableCategory.apps[category][a] + "/";
@ -132,10 +156,12 @@ void copy_app_in_category(int category) //Apps im Kategorie kopieren
foldername = "usb1" + ordner + AvailableCategory.apps[category][a] + "/";
else if(x == 2)
foldername = "dvd" + ordner + AvailableCategory.apps[category][a] + "/";
#ifndef VWII
else if(x == 3)
foldername = "gca" + ordner + AvailableCategory.apps[category][a] + "/";
else if(x == 4)
foldername = "gcb" + ordner + AvailableCategory.apps[category][a] + "/";
#endif
}
if(strcasecmp(vechomebrew_list_category[0][i].foldername.c_str(), foldername.c_str()) == 0)

7
main/source/Tools/fileop.cpp
View File

@ -558,7 +558,7 @@ void MountAllDevices()
if(dvd->startup() && dvd->isInserted())
MountDVD();
#ifndef VWII
usleep(250000);
if(__io_gcsda.startup() && __io_gcsda.isInserted())
@ -568,6 +568,7 @@ void MountAllDevices()
if(__io_gcsdb.startup() && __io_gcsdb.isInserted())
fatMountSimple("gcb", &__io_gcsdb);
#endif
}
bool MountDVDFS()
@ -785,7 +786,7 @@ void check_device()
Settings.dvd_insert = 1;
else if(Settings.dvd_insert == -1)
Settings.dvd_insert = 0;
#ifndef VWII
if(Settings.gca_insert == 2)
Settings.gca_insert = 1;
else if(Settings.gca_insert == -1)
@ -795,7 +796,7 @@ void check_device()
Settings.gcb_insert = 1;
else if(Settings.gcb_insert == -1)
Settings.gcb_insert = 0;
#endif
HaltThrobberThread();
}

10
main/source/main.cpp
View File

@ -265,10 +265,14 @@ main(int argc, char *argv[])
if(boothomebrew)
{
xprintf("selected from homebrew list:\n %s\n", Settings.forwarder_path.c_str());
#ifndef VWII
if(strstr(Settings.forwarder_path.c_str(), ":/apps/") != 0)
BootHomebrew();
else if(strstr(Settings.forwarder_path.c_str(), ":/gc_apps/") != 0)
BootGameCubeHomebrew();
#else
BootHomebrew();
#endif
}
else if(boot_buffer)
{
@ -306,6 +310,7 @@ main(int argc, char *argv[])
BootHomebrew ();
}
}
#ifndef VWII
else if(get_priiloader() == 2)
{
xprintf("Entering magic key\n");
@ -314,6 +319,7 @@ main(int argc, char *argv[])
xprintf("Starting Priiloader");
SYS_ResetSystem(SYS_RETURNTOMENU, 0, 0);
}
#endif
else if(restarthbf)
{
xprintf("Relaunching myself\n");
@ -325,6 +331,7 @@ main(int argc, char *argv[])
LoadHomebrew(segui_loc);
BootHomebrew();
}
#ifndef VWII
else if(goneek2o)
{
xprintf("Entering neek2o\n");
@ -336,6 +343,7 @@ main(int argc, char *argv[])
xprintf("Entering real NAND\n");
SYS_ResetSystem(SYS_RESTART, 0, 0);
}
#endif
else if(PowerOff == SYS_RETURNTOMENU)
{
xprintf("Entering magic key\n");
@ -349,6 +357,7 @@ main(int argc, char *argv[])
xprintf("Full Stop!\n");
SYS_ResetSystem(PowerOff, 0, 0);
}
#ifndef VWII
else if(get_bootmii() != 0)
{
if(Options.bootmii_boot2)
@ -369,6 +378,7 @@ main(int argc, char *argv[])
SYS_ResetSystem(SYS_RETURNTOMENU, 0, 0);
}
}
#endif
}
return 0;

6
main/source/menu.cpp
View File

@ -167,20 +167,22 @@ UpdateGUI (void *arg)
else if(Settings.device == "dvd")
check_dvd();
#ifndef VWII
else if(Settings.device == "gca")
check_gca();
else if(Settings.device == "gcb")
check_gcb();
#endif
else if(Settings.device == "all")
{
check_sd();
check_usb();
check_dvd();
#ifndef VWII
check_gca();
check_gcb();
#endif
}
// screenshoot