diff options
| author | Marcin Bukat <marcin.bukat@gmail.com> | 2015-01-09 00:22:40 +0100 |
|---|---|---|
| committer | Gerrit Rockbox <gerrit@rockbox.org> | 2015-01-12 11:09:27 +0100 |
| commit | 89ba7e818c0d96b779b02bc7b31c0c6a19294a46 (patch) | |
| tree | 19f7326e1f27f4bd403c4437572b579add5b61bb /apps/plugins | |
| parent | 2a3e1628a50b9de7c1462ee95eb79937795f5409 (diff) | |
| download | rockbox-89ba7e818c0d96b779b02bc7b31c0c6a19294a46.zip rockbox-89ba7e818c0d96b779b02bc7b31c0c6a19294a46.tar.gz rockbox-89ba7e818c0d96b779b02bc7b31c0c6a19294a46.tar.bz2 rockbox-89ba7e818c0d96b779b02bc7b31c0c6a19294a46.tar.xz | |
Get rid of stupid _backlight_* function names
_remote_backlight_* and _buttonlight_* are cleaned as well
Change-Id: I73653752831bbe170c26ba95d3bc04c2e3a5cf30
Diffstat (limited to 'apps/plugins')
| -rw-r--r-- | apps/plugins/lib/grey_core.c | 4 | ||||
| -rw-r--r-- | apps/plugins/mpegplayer/mpegplayer.c | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/apps/plugins/lib/grey_core.c b/apps/plugins/lib/grey_core.c index bb68235..fc445c5 100644 --- a/apps/plugins/lib/grey_core.c +++ b/apps/plugins/lib/grey_core.c @@ -469,7 +469,7 @@ static unsigned long _grey_get_pixel(int x, int y) static void _timer_isr(void) { #if defined(HAVE_BACKLIGHT_INVERSION) && !defined(SIMULATOR) - unsigned long check = rb->is_backlight_on(true) + unsigned long check = rb->isbacklight_hw_on(true) ? 0 : _GREY_BACKLIGHT_ON; if ((_grey_info.flags & (_GREY_BACKLIGHT_ON|GREY_RAWMAPPED)) == check) @@ -648,7 +648,7 @@ bool grey_init(unsigned char *gbuf, long gbuf_size, else { #if defined(HAVE_BACKLIGHT_INVERSION) && !defined(SIMULATOR) - if (rb->is_backlight_on(true)) + if (rb->isbacklight_hw_on(true)) _grey_info.flags |= _GREY_BACKLIGHT_ON; #endif fill_gvalues(); diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index 945d906..66da5d5 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c @@ -1093,7 +1093,7 @@ static void osd_lcd_enable_hook(unsigned short id, void* param) } #endif -static void osd_backlight_on_video_mode(bool video_on) +static void osdbacklight_hw_on_video_mode(bool video_on) { if (video_on) { /* Turn off backlight timeout */ @@ -1779,7 +1779,7 @@ static int osd_play(uint32_t time) retval = stream_seek(time, SEEK_SET); if (retval >= STREAM_OK) { - osd_backlight_on_video_mode(true); + osdbacklight_hw_on_video_mode(true); osd_backlight_brightness_video_mode(true); stream_show_vo(true); @@ -1826,7 +1826,7 @@ static int osd_pause(void) osd_set_status(OSD_STATUS_PAUSED); - osd_backlight_on_video_mode(false); + osdbacklight_hw_on_video_mode(false); /* Leave brightness alone and restore it when OSD is hidden */ if (stream_can_seek() && rb->global_settings->pause_rewind) { @@ -1847,7 +1847,7 @@ static void osd_resume(void) /* Cancel video and resume auto refresh - the resyc when starting * playback will perform those tasks */ osd_set_hp_pause_flag(false); - osd_backlight_on_video_mode(true); + osdbacklight_hw_on_video_mode(true); osd_backlight_brightness_video_mode(true); osd_cancel_refresh(OSD_REFRESH_VIDEO | OSD_REFRESH_RESUME); osd_set_status(OSD_STATUS_PLAYING); @@ -1871,7 +1871,7 @@ static void osd_stop(void) if (resume_time != INVALID_TIMESTAMP) settings.resume_time = resume_time; - osd_backlight_on_video_mode(false); + osdbacklight_hw_on_video_mode(false); osd_backlight_brightness_video_mode(false); } |