funkey/RetroFE
1
0
Fork 0
mirror of https://github.com/FunKey-Project/RetroFE.git synced 2025-12-13 02:08:52 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

add missing pclose()

Browse Source 
Signed-off-by: Vincent-FK <vincent.buso@funkey-project.com>
This commit is contained in:
Vincent-FK 2021-04-13 23:17:34 +02:00
parent 473e9515ec
commit 152bae7693
3 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
RetroFE/Source/Execute/Launcher.cpp
View File

@ -47,6 +47,7 @@ bool Launcher::run(std::string collection, Item *collectionItem)
std::string matchedExtension; std::string matchedExtension;
std::string args; std::string args;
bool res = true; bool res = true;
FILE *fp;
std::string launcherFile = Utils::combinePath( Configuration::absolutePath, "collections", collectionItem->collectionInfo->name, "launchers", collectionItem->name + ".conf" ); std::string launcherFile = Utils::combinePath( Configuration::absolutePath, "collections", collectionItem->collectionInfo->name, "launchers", collectionItem->name + ".conf" );
std::ifstream launcherStream( launcherFile.c_str( ) ); std::ifstream launcherStream( launcherFile.c_str( ) );
@ -120,7 +121,10 @@ bool Launcher::run(std::string collection, Item *collectionItem)
collection); collection);
/* Restart audio amp */ /* Restart audio amp */
popen(SHELL_CMD_TURN_AMPLI_ON, "r"); fp = popen(SHELL_CMD_TURN_AMPLI_ON, "r");
if (fp != NULL) {
pclose(fp);
}
/* Execute game */ /* Execute game */
if(!execute(executablePath, args, currentDirectory)) if(!execute(executablePath, args, currentDirectory))
@ -130,7 +134,10 @@ bool Launcher::run(std::string collection, Item *collectionItem)
} }
/* Stop audio amp */ /* Stop audio amp */
popen(SHELL_CMD_TURN_AMPLI_OFF, "r"); fp = popen(SHELL_CMD_TURN_AMPLI_OFF, "r");
if (fp != NULL) {
pclose(fp);
}
/* Restore stored PID */ /* Restore stored PID */
char shellCmd[20]; char shellCmd[20];

13
RetroFE/Source/Menu/MenuMode.cpp
View File

@ -399,6 +399,7 @@ void MenuMode::init_menu_system_values(){
volume_percentage = 50; ///wrong value: setting default to 50 volume_percentage = 50; ///wrong value: setting default to 50
} }
else{ else{
pclose(fp);
fgets(res, sizeof(res)-1, fp); fgets(res, sizeof(res)-1, fp);
/// Check if Volume is a number (at least the first char) /// Check if Volume is a number (at least the first char)
@ -419,6 +420,7 @@ void MenuMode::init_menu_system_values(){
brightness_percentage = 50; ///wrong value: setting default to 50 brightness_percentage = 50; ///wrong value: setting default to 50
} }
else{ else{
pclose(fp);
fgets(res, sizeof(res)-1, fp); fgets(res, sizeof(res)-1, fp);
/// Check if brightness is a number (at least the first char) /// Check if brightness is a number (at least the first char)
@ -846,6 +848,8 @@ int MenuMode::launch( )
fp = popen(shell_cmd, "r"); fp = popen(shell_cmd, "r");
if (fp == NULL) { if (fp == NULL) {
MENU_ERROR_PRINTF("Failed to run command %s\n", shell_cmd); MENU_ERROR_PRINTF("Failed to run command %s\n", shell_cmd);
} else {
pclose(fp);
} }
/// ------ Refresh screen ------ /// ------ Refresh screen ------
@ -862,6 +866,8 @@ int MenuMode::launch( )
fp = popen(shell_cmd, "r"); fp = popen(shell_cmd, "r");
if (fp == NULL) { if (fp == NULL) {
MENU_ERROR_PRINTF("Failed to run command %s\n", shell_cmd); MENU_ERROR_PRINTF("Failed to run command %s\n", shell_cmd);
} else {
pclose(fp);
} }
/// ------ Refresh screen ------ /// ------ Refresh screen ------
screen_refresh = 1; screen_refresh = 1;
@ -907,6 +913,8 @@ int MenuMode::launch( )
fp = popen(shell_cmd, "r"); fp = popen(shell_cmd, "r");
if (fp == NULL) { if (fp == NULL) {
MENU_ERROR_PRINTF("Failed to run command %s\n", shell_cmd); MENU_ERROR_PRINTF("Failed to run command %s\n", shell_cmd);
} else {
pclose(fp);
} }
/// ------ Refresh screen ------ /// ------ Refresh screen ------
screen_refresh = 1; screen_refresh = 1;
@ -922,6 +930,8 @@ int MenuMode::launch( )
fp = popen(shell_cmd, "r"); fp = popen(shell_cmd, "r");
if (fp == NULL) { if (fp == NULL) {
MENU_ERROR_PRINTF("Failed to run command %s\n", shell_cmd); MENU_ERROR_PRINTF("Failed to run command %s\n", shell_cmd);
} else {
pclose(fp);
} }
/// ------ Refresh screen ------ /// ------ Refresh screen ------
screen_refresh = 1; screen_refresh = 1;
@ -1001,6 +1011,7 @@ int MenuMode::launch( )
} }
else{ else{
usb_sharing = !usb_sharing; usb_sharing = !usb_sharing;
pclose(fp);
}*/ }*/
bool res = Utils::executeRawPath(usb_sharing?SHELL_CMD_USB_UNMOUNT:SHELL_CMD_USB_MOUNT); bool res = Utils::executeRawPath(usb_sharing?SHELL_CMD_USB_UNMOUNT:SHELL_CMD_USB_MOUNT);
@ -1091,6 +1102,8 @@ int MenuMode::launch( )
fp = popen(shell_cmd, "r"); fp = popen(shell_cmd, "r");
if (fp == NULL) { if (fp == NULL) {
MENU_ERROR_PRINTF("Failed to run command %s\n", shell_cmd); MENU_ERROR_PRINTF("Failed to run command %s\n", shell_cmd);
} else {
pclose(fp);
} }
return MENU_RETURN_EXIT; return MENU_RETURN_EXIT;

18
RetroFE/Source/Sound/Sound.cpp
View File

@ -48,11 +48,16 @@ Sound::~Sound()
void Sound::play() void Sound::play()
{ {
FILE *fp;
//printf("%s\n", __func__); //printf("%s\n", __func__);
SDL_RemoveTimer(idTimer); SDL_RemoveTimer(idTimer);
if(!ampliStarted){ if(!ampliStarted){
popen(SHELL_CMD_TURN_AMPLI_ON, "r"); fp = popen(SHELL_CMD_TURN_AMPLI_ON, "r");
ampliStarted = 1; if (fp != NULL) {
ampliStarted = 1;
pclose(fp);
}
} }
if(chunk_) if(chunk_)
@ -64,9 +69,14 @@ void Sound::play()
uint32_t Sound::turnOffAmpli(uint32_t interval, void *param) uint32_t Sound::turnOffAmpli(uint32_t interval, void *param)
{ {
FILE *fp;
//printf("%s\n", __func__); //printf("%s\n", __func__);
popen(SHELL_CMD_TURN_AMPLI_OFF, "r"); fp = popen(SHELL_CMD_TURN_AMPLI_OFF, "r");
ampliStarted = 0; if (fp != NULL) {
ampliStarted = 0;
pclose(fp);
}
return 0; return 0;
} }