From ae0b0c91fc56068e6264d1d588d5e3774bcf5b89 Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Thu, 21 Jan 2010 10:55:40 +0000 Subject: [PATCH] fixes git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@199 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/89d89befe5272b68bb4c7ed05d9e82080888cecf Author: [CST] Focus Date: 2010-01-21 (Thu, 21 Jan 2010) ------------------ This commit was generated by Migit --- lib/libtuxtxt/tuxtxt.cpp | 6 +++--- src/neutrino.cpp | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/libtuxtxt/tuxtxt.cpp b/lib/libtuxtxt/tuxtxt.cpp index e896790bc..636eef4bc 100644 --- a/lib/libtuxtxt/tuxtxt.cpp +++ b/lib/libtuxtxt/tuxtxt.cpp @@ -1512,9 +1512,10 @@ void tuxtx_pause_subtitle(bool pause) if(!pause) ttx_paused = 0; else { + printf("TuxTxt subtitle asking to pause...\n"); ttx_req_pause = 1; while(!ttx_paused) - sleep(10); + usleep(10); printf("TuxTxt subtitle paused\n"); } } @@ -1552,7 +1553,7 @@ int tuxtx_main(int _rc, int pid, int page) tuxtxt_cache.page = 0x100; if(page) { tuxtxt_cache.page = page; - use_gui = 1; + use_gui = 0; } #endif @@ -4967,7 +4968,6 @@ void RenderPage() int row, col, byte, startrow = 0;; int national_subset_bak = national_subset; - /* update lcd */ UpdateLCD(); diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 0066838d2..dcb80252c 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -4468,6 +4468,7 @@ void stop_daemons(bool stopall) pthread_join(sections_thread, NULL); printf("sectionsd shutdown done\n"); #endif + tuxtx_stop_subtitle(); printf("zapit shutdown\n"); g_Zapit->shutdown(); pthread_join(zapit_thread, NULL);