Advertisement
svenhoefer

Untitled

Jan 24th, 2018
352
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 1.66 KB | None | 0 0
  1. diff --git a/lib/libtuxtxt/tuxtxt.cpp b/lib/libtuxtxt/tuxtxt.cpp
  2. index 839386d..1bd250f 100644
  3. --- a/lib/libtuxtxt/tuxtxt.cpp
  4. +++ b/lib/libtuxtxt/tuxtxt.cpp
  5. @@ -39,9 +39,6 @@ static int ttx_req_pause;
  6.  static int sub_pid, sub_page;
  7.  static bool use_gui;
  8.  static int cfg_national_subset;
  9. -#if HAVE_SPARK_HARDWARE
  10. -bool isTtxEplayer = false;
  11. -#endif
  12.  
  13.  static int screen_x, screen_y, screen_w, screen_h;
  14.  
  15. @@ -1537,11 +1534,7 @@ void tuxtx_pause_subtitle(bool pause)
  16.         //printf("TuxTxt subtitle unpause, running %d pid %d page %d\n", reader_running, sub_pid, sub_page);
  17.         ttx_paused = 0;
  18.         if(!reader_running && sub_pid && sub_page)
  19. -#if HAVE_SPARK_HARDWARE
  20. -           tuxtx_main(sub_pid, sub_page, 0, isTtxEplayer);
  21. -#else
  22.             tuxtx_main(sub_pid, sub_page);
  23. -#endif
  24.     }
  25.     else {
  26.         if(!reader_running)
  27. @@ -1599,21 +1592,10 @@ int tuxtx_subtitle_running(int *pid, int *page, int *running)
  28.     return ret;
  29.  }
  30.  
  31. -#if HAVE_SPARK_HARDWARE
  32. -int tuxtx_main(int pid, int page, int source, bool isEplayer)
  33. -#else
  34.  int tuxtx_main(int pid, int page, int source)
  35. -#endif
  36.  {
  37.     char cvs_revision[] = "$Revision: 1.95 $";
  38.  
  39. -#if HAVE_SPARK_HARDWARE
  40. -   if (isTtxEplayer != isEplayer) {
  41. -       tuxtxt_stop();
  42. -       tuxtxt_clear_cache();
  43. -       isTtxEplayer = isEplayer;
  44. -   }
  45. -#endif
  46.     use_gui = 1;
  47.     boxed = 0;
  48.     oldboxed = boxed;
  49. @@ -2322,10 +2304,6 @@ static void CleanUp()
  50.   ******************************************************************************/
  51.  static int GetTeletextPIDs()
  52.  {
  53. -#if HAVE_SPARK_HARDWARE
  54. -   if (isTtxEplayer)
  55. -       return 0;
  56. -#endif
  57.     int pat_scan, pmt_scan, sdt_scan, desc_scan, pid_test, byte, diff, first_sdt_sec;
  58.  
  59.     unsigned char bufPAT[1024];
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement