From a7980757bbbbdd1cd237cccb258b284fba2aa126 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Mon, 13 Nov 2017 21:17:36 +0100 Subject: [PATCH] - simple_display: switch back to simplified proc_put calls Signed-off-by: Thilo Graf --- src/driver/simple_display.cpp | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/src/driver/simple_display.cpp b/src/driver/simple_display.cpp index 876de199e..b48643fc4 100644 --- a/src/driver/simple_display.cpp +++ b/src/driver/simple_display.cpp @@ -465,7 +465,7 @@ void CLCD::setMode(const MODES m, const char * const title) mode = m; setlcdparameter(); - proc_put("/proc/stb/lcd/show_symbols", "1", 1); + proc_put("/proc/stb/lcd/show_symbols", true); switch (m) { case MODE_TVRADIO: if (g_info.hw_caps->display_type == HW_DISPLAY_LINE_TEXT) @@ -495,7 +495,7 @@ void CLCD::setMode(const MODES m, const char * const title) setled(0, 1); showclock = true; showTime(true); - proc_put("/proc/stb/lcd/show_symbols", "0", 1); + proc_put("/proc/stb/lcd/show_symbols", false); break; default: showclock = true; @@ -593,10 +593,10 @@ void CLCD::setScrollMode(int scroll) } else { - proc_put("/proc/stb/lcd/initial_scroll_delay", "0", 1); - proc_put("/proc/stb/lcd/final_scroll_delay", "0", 1); - proc_put("/proc/stb/lcd/scroll_delay", "0", 1); - proc_put("/proc/stb/lcd/scroll_repeats", "0", 1); + proc_put("/proc/stb/lcd/initial_scroll_delay", false); + proc_put("/proc/stb/lcd/final_scroll_delay", false); + proc_put("/proc/stb/lcd/scroll_delay", false); + proc_put("/proc/stb/lcd/scroll_repeats", false); } } @@ -810,28 +810,32 @@ void CLCD::ShowIcon(fp_icon i, bool on) { case FP_ICON_CAM1: led_r = on; - if (g_info.hw_caps->display_type == HW_DISPLAY_LINE_TEXT) { + if (g_info.hw_caps->display_type == HW_DISPLAY_LINE_TEXT) + { SetIcons(SPARK_REC1, on); - proc_put("/proc/stb/lcd/symbol_recording", on ? "1" : "0", 1);} + proc_put("/proc/stb/lcd/symbol_recording", on); + } else setled(led_r, -1); /* switch instant on / switch off if disabling */ break; case FP_ICON_PLAY: led_g = on; - if (g_info.hw_caps->display_type == HW_DISPLAY_LINE_TEXT) { + if (g_info.hw_caps->display_type == HW_DISPLAY_LINE_TEXT) + { SetIcons(SPARK_PLAY, on); - proc_put("/proc/stb/lcd/symbol_playback", on ? "1" : "0", 1);} + proc_put("/proc/stb/lcd/symbol_playback", on); + } else setled(-1, led_g); break; case FP_ICON_USB: usb_icon = on; SetIcons(SPARK_USB, on); - proc_put("/proc/stb/lcd/symbol_usb", on ? "1" : "0", 1); + proc_put("/proc/stb/lcd/symbol_usb", on); break; case FP_ICON_HDD: SetIcons(SPARK_HDD, on); - proc_put("/proc/stb/lcd/symbol_hdd", on ? "1" : "0", 1); + proc_put("/proc/stb/lcd/symbol_hdd", on); break; case FP_ICON_PAUSE: SetIcons(SPARK_PAUSE, on); @@ -848,14 +852,14 @@ void CLCD::ShowIcon(fp_icon i, bool on) break; case FP_ICON_LOCK: SetIcons(SPARK_CA, on); - proc_put("/proc/stb/lcd/symbol_scrambled", on ? "1" : "0", 1); + proc_put("/proc/stb/lcd/symbol_scrambled", on); break; case FP_ICON_RADIO: SetIcons(SPARK_AUDIO, on); break; case FP_ICON_TV: SetIcons(SPARK_TVMODE_LOG, on); - proc_put("/proc/stb/lcd/symbol_tv", on ? "1" : "0", 1); + proc_put("/proc/stb/lcd/symbol_tv", on); break; case FP_ICON_HD: SetIcons(SPARK_DOUBLESCREEN, on); @@ -863,7 +867,7 @@ void CLCD::ShowIcon(fp_icon i, bool on) case FP_ICON_CLOCK: timer_icon = on; SetIcons(SPARK_CLOCK, on); - proc_put("/proc/stb/lcd/symbol_timeshift", on ? "1" : "0", 1); + proc_put("/proc/stb/lcd/symbol_timeshift", on); break; default: break;