diff --git a/lib/libtuxtxt/teletext.h b/lib/libtuxtxt/teletext.h index 6bc3dc590..cb0037d1e 100644 --- a/lib/libtuxtxt/teletext.h +++ b/lib/libtuxtxt/teletext.h @@ -5,7 +5,7 @@ int tuxtxt_init(); void tuxtxt_close(); void tuxtxt_start(int tpid, int source = 0); // Start caching int tuxtxt_stop(); // Stop caching -int tuxtx_main(int _rc, int pid, int page = 0, int source = 0); +int tuxtx_main(int pid, int page = 0, int source = 0); void tuxtx_stop_subtitle(); int tuxtx_subtitle_running(int *pid, int *page, int *running); void tuxtx_pause_subtitle(bool pause = 1); diff --git a/lib/libtuxtxt/tuxtxt.cpp b/lib/libtuxtxt/tuxtxt.cpp index 394d8e29f..8f630f769 100644 --- a/lib/libtuxtxt/tuxtxt.cpp +++ b/lib/libtuxtxt/tuxtxt.cpp @@ -1561,7 +1561,7 @@ void tuxtx_pause_subtitle(bool pause) //printf("TuxTxt subtitle unpause, running %d pid %d page %d\n", reader_running, sub_pid, sub_page); ttx_paused = 0; if(!reader_running && sub_pid && sub_page) - tuxtx_main(0, sub_pid, sub_page); + tuxtx_main(sub_pid, sub_page); } else { if(!reader_running) @@ -1599,7 +1599,7 @@ void tuxtx_set_pid(int pid, int page, const char * cc) printf("TuxTxt subtitle set pid %d page %d lang %s (%d)\n", sub_pid, sub_page, cc, cfg_national_subset); ttx_paused = 1; if(sub_pid && sub_page) - tuxtx_main(0, sub_pid, sub_page); + tuxtx_main(sub_pid, sub_page); #endif } @@ -1620,7 +1620,7 @@ int tuxtx_subtitle_running(int *pid, int *page, int *running) return ret; } -int tuxtx_main(int /*_rc*/, int pid, int page, int source) +int tuxtx_main(int pid, int page, int source) { char cvs_revision[] = "$Revision: 1.95 $"; diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index 893508633..87499697e 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -1595,7 +1595,7 @@ void CMoviePlayerGui::PlayFileLoop(void) else { if (g_settings.cacheTXT) tuxtxt_stop(); - tuxtx_main(g_RCInput->getFileHandle(), g_RemoteControl->current_PIDs.PIDs.vtxtpid, 0, 2); + tuxtx_main(g_RemoteControl->current_PIDs.PIDs.vtxtpid, 0, 2); frameBuffer->paintBackground(); } if (restore) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 8ab84bd88..86b8d6d34 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -2538,7 +2538,7 @@ void CNeutrinoApp::RealRun() StopSubtitles(); tuxtx_stop_subtitle(); - tuxtx_main(g_RCInput->getFileHandle(), g_RemoteControl->current_PIDs.PIDs.vtxtpid); + tuxtx_main(g_RemoteControl->current_PIDs.PIDs.vtxtpid); frameBuffer->paintBackground(); //if(!g_settings.cacheTXT) diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp index e177a3a34..d14bae874 100644 --- a/src/system/setting_helpers.cpp +++ b/src/system/setting_helpers.cpp @@ -362,7 +362,7 @@ printf("CSubtitleChangeExec::exec: TTX, pid %x page %x lang %s\n", pid, page, pt tuxtx_stop_subtitle(); tuxtx_set_pid(pid, page, ptr); dvbsub_stop(); - tuxtx_main(g_RCInput->getFileHandle(), pid, page); + tuxtx_main(pid, page); } return menu_return::RETURN_EXIT; }