summaryrefslogtreecommitdiff
path: root/apps/plugins/mpegplayer/mpeg_settings.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/plugins/mpegplayer/mpeg_settings.c')
-rw-r--r--apps/plugins/mpegplayer/mpeg_settings.c68
1 files changed, 34 insertions, 34 deletions
diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c
index 1ac2476b25..1f321c1285 100644
--- a/apps/plugins/mpegplayer/mpeg_settings.c
+++ b/apps/plugins/mpegplayer/mpeg_settings.c
@@ -540,11 +540,11 @@ static void grey_splash(int ticks, const unsigned char *fmt, ...)
540 540
541static void show_loading(struct vo_rect *rc) 541static void show_loading(struct vo_rect *rc)
542{ 542{
543 int oldmode = lcd_(get_drawmode)(); 543 int oldmode = mylcd_get_drawmode();
544 lcd_(set_drawmode)(DRMODE_SOLID | DRMODE_INVERSEVID); 544 mylcd_set_drawmode(DRMODE_SOLID | DRMODE_INVERSEVID);
545 lcd_(fillrect)(rc->l-1, rc->t-1, rc->r - rc->l + 2, rc->b - rc->t + 2); 545 mylcd_fillrect(rc->l-1, rc->t-1, rc->r - rc->l + 2, rc->b - rc->t + 2);
546 lcd_(set_drawmode)(oldmode); 546 mylcd_set_drawmode(oldmode);
547 lcd_(splash)(0, "Loading..."); 547 mylcd_splash(0, "Loading...");
548} 548}
549 549
550static void draw_slider(uint32_t range, uint32_t pos, struct vo_rect *rc) 550static void draw_slider(uint32_t range, uint32_t pos, struct vo_rect *rc)
@@ -567,36 +567,36 @@ static void draw_slider(uint32_t range, uint32_t pos, struct vo_rect *rc)
567 /* Put positition on left */ 567 /* Put positition on left */
568 ts_to_hms(pos, &hms); 568 ts_to_hms(pos, &hms);
569 hms_format(str, sizeof(str), &hms); 569 hms_format(str, sizeof(str), &hms);
570 lcd_(getstringsize)(str, NULL, &text_h); 570 mylcd_getstringsize(str, NULL, &text_h);
571 text_y = SLIDER_Y - SLIDER_TEXTMARGIN - text_h; 571 text_y = SLIDER_Y - SLIDER_TEXTMARGIN - text_h;
572 572
573 if (rc == NULL) 573 if (rc == NULL)
574 { 574 {
575 int oldmode = lcd_(get_drawmode)(); 575 int oldmode = mylcd_get_drawmode();
576 lcd_(set_drawmode)(DRMODE_BG | DRMODE_INVERSEVID); 576 mylcd_set_drawmode(DRMODE_BG | DRMODE_INVERSEVID);
577 lcd_(fillrect)(SLIDER_X, text_y, SLIDER_WIDTH, 577 mylcd_fillrect(SLIDER_X, text_y, SLIDER_WIDTH,
578 LCD_HEIGHT - SLIDER_BMARGIN - text_y 578 LCD_HEIGHT - SLIDER_BMARGIN - text_y
579 - SLIDER_TMARGIN); 579 - SLIDER_TMARGIN);
580 lcd_(set_drawmode)(oldmode); 580 mylcd_set_drawmode(oldmode);
581 581
582 lcd_(putsxy)(SLIDER_X, text_y, str); 582 mylcd_putsxy(SLIDER_X, text_y, str);
583 583
584 /* Put duration on right */ 584 /* Put duration on right */
585 ts_to_hms(range, &hms); 585 ts_to_hms(range, &hms);
586 hms_format(str, sizeof(str), &hms); 586 hms_format(str, sizeof(str), &hms);
587 lcd_(getstringsize)(str, &text_w, NULL); 587 mylcd_getstringsize(str, &text_w, NULL);
588 588
589 lcd_(putsxy)(SLIDER_X + SLIDER_WIDTH - text_w, text_y, str); 589 mylcd_putsxy(SLIDER_X + SLIDER_WIDTH - text_w, text_y, str);
590 590
591 /* Draw slider */ 591 /* Draw slider */
592 lcd_(drawrect)(SLIDER_X, SLIDER_Y, SLIDER_WIDTH, SLIDER_HEIGHT); 592 mylcd_drawrect(SLIDER_X, SLIDER_Y, SLIDER_WIDTH, SLIDER_HEIGHT);
593 lcd_(fillrect)(SLIDER_X, SLIDER_Y, 593 mylcd_fillrect(SLIDER_X, SLIDER_Y,
594 muldiv_uint32(pos, SLIDER_WIDTH, range), 594 muldiv_uint32(pos, SLIDER_WIDTH, range),
595 SLIDER_HEIGHT); 595 SLIDER_HEIGHT);
596 596
597 /* Update screen */ 597 /* Update screen */
598 lcd_(update_rect)(SLIDER_X, text_y - SLIDER_TMARGIN, SLIDER_WIDTH, 598 mylcd_update_rect(SLIDER_X, text_y - SLIDER_TMARGIN, SLIDER_WIDTH,
599 LCD_HEIGHT - SLIDER_BMARGIN - text_y + SLIDER_TEXTMARGIN); 599 LCD_HEIGHT - SLIDER_BMARGIN - text_y + SLIDER_TEXTMARGIN);
600 } 600 }
601 else 601 else
602 { 602 {
@@ -612,28 +612,28 @@ static bool display_thumb_image(const struct vo_rect *rc)
612{ 612{
613 if (!stream_display_thumb(rc)) 613 if (!stream_display_thumb(rc))
614 { 614 {
615 lcd_(splash)(0, "Frame not available"); 615 mylcd_splash(0, "Frame not available");
616 return false; 616 return false;
617 } 617 }
618 618
619 /* Draw a raised border around the frame */ 619 /* Draw a raised border around the frame */
620 int oldcolor = lcd_(get_foreground)(); 620 int oldcolor = mylcd_get_foreground();
621 lcd_(set_foreground)(DRAW_LIGHTGRAY); 621 mylcd_set_foreground(MYLCD_LIGHTGRAY);
622 622
623 lcd_(hline)(rc->l-1, rc->r-1, rc->t-1); 623 mylcd_hline(rc->l-1, rc->r-1, rc->t-1);
624 lcd_(vline)(rc->l-1, rc->t, rc->b-1); 624 mylcd_vline(rc->l-1, rc->t, rc->b-1);
625 625
626 lcd_(set_foreground)(DRAW_DARKGRAY); 626 mylcd_set_foreground(MYLCD_DARKGRAY);
627 627
628 lcd_(hline)(rc->l-1, rc->r, rc->b); 628 mylcd_hline(rc->l-1, rc->r, rc->b);
629 lcd_(vline)(rc->r, rc->t-1, rc->b); 629 mylcd_vline(rc->r, rc->t-1, rc->b);
630 630
631 lcd_(set_foreground)(oldcolor); 631 mylcd_set_foreground(oldcolor);
632 632
633 lcd_(update_rect)(rc->l-1, rc->t-1, rc->r - rc->l + 2, 1); 633 mylcd_update_rect(rc->l-1, rc->t-1, rc->r - rc->l + 2, 1);
634 lcd_(update_rect)(rc->l-1, rc->t, 1, rc->b - rc->t); 634 mylcd_update_rect(rc->l-1, rc->t, 1, rc->b - rc->t);
635 lcd_(update_rect)(rc->l-1, rc->b, rc->r - rc->l + 2, 1); 635 mylcd_update_rect(rc->l-1, rc->b, rc->r - rc->l + 2, 1);
636 lcd_(update_rect)(rc->r, rc->t, 1, rc->b - rc->t); 636 mylcd_update_rect(rc->r, rc->t, 1, rc->b - rc->t);
637 637
638 return true; 638 return true;
639} 639}
@@ -679,8 +679,8 @@ static int get_start_time(uint32_t duration)
679 679
680 enum state_enum slider_state = STATE0; 680 enum state_enum slider_state = STATE0;
681 681
682 lcd_(clear_display)(); 682 mylcd_clear_display();
683 lcd_(update)(); 683 mylcd_update();
684 684
685#if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP) 685#if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP)
686 rb->add_event(LCD_EVENT_ACTIVATION, false, get_start_time_lcd_enable_hook); 686 rb->add_event(LCD_EVENT_ACTIVATION, false, get_start_time_lcd_enable_hook);