summaryrefslogtreecommitdiff
path: root/apps/plugins
diff options
context:
space:
mode:
authorMarcin Bukat <marcin.bukat@gmail.com>2015-01-09 00:22:40 +0100
committerGerrit Rockbox <gerrit@rockbox.org>2015-01-12 11:09:27 +0100
commit89ba7e818c0d96b779b02bc7b31c0c6a19294a46 (patch)
tree19f7326e1f27f4bd403c4437572b579add5b61bb /apps/plugins
parent2a3e1628a50b9de7c1462ee95eb79937795f5409 (diff)
downloadrockbox-89ba7e818c0d96b779b02bc7b31c0c6a19294a46.tar.gz
rockbox-89ba7e818c0d96b779b02bc7b31c0c6a19294a46.zip
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.c4
-rw-r--r--apps/plugins/mpegplayer/mpegplayer.c10
2 files changed, 7 insertions, 7 deletions
diff --git a/apps/plugins/lib/grey_core.c b/apps/plugins/lib/grey_core.c
index bb6823522d..fc445c5403 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)
469static void _timer_isr(void) 469static void _timer_isr(void)
470{ 470{
471#if defined(HAVE_BACKLIGHT_INVERSION) && !defined(SIMULATOR) 471#if defined(HAVE_BACKLIGHT_INVERSION) && !defined(SIMULATOR)
472 unsigned long check = rb->is_backlight_on(true) 472 unsigned long check = rb->isbacklight_hw_on(true)
473 ? 0 : _GREY_BACKLIGHT_ON; 473 ? 0 : _GREY_BACKLIGHT_ON;
474 474
475 if ((_grey_info.flags & (_GREY_BACKLIGHT_ON|GREY_RAWMAPPED)) == check) 475 if ((_grey_info.flags & (_GREY_BACKLIGHT_ON|GREY_RAWMAPPED)) == check)
@@ -648,7 +648,7 @@ bool grey_init(unsigned char *gbuf, long gbuf_size,
648 else 648 else
649 { 649 {
650#if defined(HAVE_BACKLIGHT_INVERSION) && !defined(SIMULATOR) 650#if defined(HAVE_BACKLIGHT_INVERSION) && !defined(SIMULATOR)
651 if (rb->is_backlight_on(true)) 651 if (rb->isbacklight_hw_on(true))
652 _grey_info.flags |= _GREY_BACKLIGHT_ON; 652 _grey_info.flags |= _GREY_BACKLIGHT_ON;
653#endif 653#endif
654 fill_gvalues(); 654 fill_gvalues();
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c
index 945d906d8b..66da5d52f7 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)
1093} 1093}
1094#endif 1094#endif
1095 1095
1096static void osd_backlight_on_video_mode(bool video_on) 1096static void osdbacklight_hw_on_video_mode(bool video_on)
1097{ 1097{
1098 if (video_on) { 1098 if (video_on) {
1099 /* Turn off backlight timeout */ 1099 /* Turn off backlight timeout */
@@ -1779,7 +1779,7 @@ static int osd_play(uint32_t time)
1779 retval = stream_seek(time, SEEK_SET); 1779 retval = stream_seek(time, SEEK_SET);
1780 1780
1781 if (retval >= STREAM_OK) { 1781 if (retval >= STREAM_OK) {
1782 osd_backlight_on_video_mode(true); 1782 osdbacklight_hw_on_video_mode(true);
1783 osd_backlight_brightness_video_mode(true); 1783 osd_backlight_brightness_video_mode(true);
1784 stream_show_vo(true); 1784 stream_show_vo(true);
1785 1785
@@ -1826,7 +1826,7 @@ static int osd_pause(void)
1826 1826
1827 osd_set_status(OSD_STATUS_PAUSED); 1827 osd_set_status(OSD_STATUS_PAUSED);
1828 1828
1829 osd_backlight_on_video_mode(false); 1829 osdbacklight_hw_on_video_mode(false);
1830 /* Leave brightness alone and restore it when OSD is hidden */ 1830 /* Leave brightness alone and restore it when OSD is hidden */
1831 1831
1832 if (stream_can_seek() && rb->global_settings->pause_rewind) { 1832 if (stream_can_seek() && rb->global_settings->pause_rewind) {
@@ -1847,7 +1847,7 @@ static void osd_resume(void)
1847 /* Cancel video and resume auto refresh - the resyc when starting 1847 /* Cancel video and resume auto refresh - the resyc when starting
1848 * playback will perform those tasks */ 1848 * playback will perform those tasks */
1849 osd_set_hp_pause_flag(false); 1849 osd_set_hp_pause_flag(false);
1850 osd_backlight_on_video_mode(true); 1850 osdbacklight_hw_on_video_mode(true);
1851 osd_backlight_brightness_video_mode(true); 1851 osd_backlight_brightness_video_mode(true);
1852 osd_cancel_refresh(OSD_REFRESH_VIDEO | OSD_REFRESH_RESUME); 1852 osd_cancel_refresh(OSD_REFRESH_VIDEO | OSD_REFRESH_RESUME);
1853 osd_set_status(OSD_STATUS_PLAYING); 1853 osd_set_status(OSD_STATUS_PLAYING);
@@ -1871,7 +1871,7 @@ static void osd_stop(void)
1871 if (resume_time != INVALID_TIMESTAMP) 1871 if (resume_time != INVALID_TIMESTAMP)
1872 settings.resume_time = resume_time; 1872 settings.resume_time = resume_time;
1873 1873
1874 osd_backlight_on_video_mode(false); 1874 osdbacklight_hw_on_video_mode(false);
1875 osd_backlight_brightness_video_mode(false); 1875 osd_backlight_brightness_video_mode(false);
1876} 1876}
1877 1877