check for active downloads before shutting down; indicate dl on vfd

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/lcdd.h
	src/driver/simple_display.cpp
	src/neutrino.cpp
	src/system/locals.h
	src/system/locals_intern.h
This commit is contained in:
martii
2013-12-15 11:29:12 +01:00
committed by [CST] Focus
parent fd1ba8df97
commit a3adf2798a
8 changed files with 17 additions and 8 deletions

View File

@@ -2074,7 +2074,7 @@ typedef enum
LOCALE_SETTINGS_POS_TOP_RIGHT,
LOCALE_SETTINGS_RESTORE,
LOCALE_SETTINGS_RESTORE_WARN,
LOCALE_SHUTDOWN_RECODING_QUERY,
LOCALE_SHUTDOWN_RECORDING_QUERY,
LOCALE_SHUTDOWNTIMER_ANNOUNCE,
LOCALE_SLEEPTIMERBOX_ANNOUNCE,
LOCALE_SLEEPTIMERBOX_HINT1,

View File

@@ -2074,7 +2074,7 @@ const char * locale_real_names[] =
"settings.pos_top_right",
"settings.restore",
"settings.restore_warn",
"shutdown.recoding_query",
"shutdown.recording_query",
"shutdowntimer.announce",
"sleeptimerbox.announce",
"sleeptimerbox.hint1",

View File

@@ -36,6 +36,7 @@
#include "settings.h"
#include "set_threadname.h"
#include <global.h>
#include <driver/display.h>
static cYTCache *instance = NULL;
@@ -178,6 +179,8 @@ void *cYTCache::downloadThread(void *arg) {
set_threadname("ytdownload");
cYTCache *caller = (cYTCache *)arg;
//CVFD::getInstance()->ShowIcon(FP_ICON_DOWNLOAD, true);
while (caller->thread) {
MI_MOVIE_INFO mi;
{
@@ -207,6 +210,9 @@ void *cYTCache::downloadThread(void *arg) {
caller->pending.erase(caller->pending.begin());
}
}
//CVFD::getInstance()->ShowIcon(FP_ICON_DOWNLOAD, false);
fprintf(stderr, "%s exiting\n", __func__);
pthread_exit(NULL);
}

View File

@@ -63,5 +63,6 @@ class cYTCache
void clearCompleted(MI_MOVIE_INFO::miSource source = MI_MOVIE_INFO::YT);
void clearFailed(MI_MOVIE_INFO::miSource source = MI_MOVIE_INFO::YT);
bool getNameIfExists(std::string &fname, const std::string &id, int itag, std::string ext = ".jpg");
bool isActive(void) { return (bool) thread; }
};
#endif