diff options
Diffstat (limited to 'apps/plugins/vu_meter.c')
-rw-r--r-- | apps/plugins/vu_meter.c | 49 |
1 files changed, 19 insertions, 30 deletions
diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c index 66ddf03dd8..80e1960fad 100644 --- a/apps/plugins/vu_meter.c +++ b/apps/plugins/vu_meter.c | |||
@@ -397,18 +397,7 @@ | |||
397 | #define LABEL_MENU "PLAY" | 397 | #define LABEL_MENU "PLAY" |
398 | #define LABEL_VOLUME "VOL UP/DN" | 398 | #define LABEL_VOLUME "VOL UP/DN" |
399 | 399 | ||
400 | #elif (CONFIG_KEYPAD == XDUOO_X3II_PAD) | 400 | #elif (CONFIG_KEYPAD == XDUOO_X3II_PAD) || (CONFIG_KEYPAD == XDUOO_X20_PAD) |
401 | #define VUMETER_QUIT BUTTON_POWER | ||
402 | #define VUMETER_HELP BUTTON_HOME | ||
403 | #define VUMETER_MENU BUTTON_PLAY | ||
404 | #define VUMETER_UP BUTTON_VOL_UP | ||
405 | #define VUMETER_DOWN BUTTON_VOL_DOWN | ||
406 | #define LABEL_HELP "HOME" | ||
407 | #define LABEL_QUIT "POWER" | ||
408 | #define LABEL_MENU "PLAY" | ||
409 | #define LABEL_VOLUME "VOL UP/DN" | ||
410 | |||
411 | #elif (CONFIG_KEYPAD == XDUOO_X20_PAD) | ||
412 | #define VUMETER_QUIT BUTTON_POWER | 401 | #define VUMETER_QUIT BUTTON_POWER |
413 | #define VUMETER_HELP BUTTON_HOME | 402 | #define VUMETER_HELP BUTTON_HOME |
414 | #define VUMETER_MENU BUTTON_PLAY | 403 | #define VUMETER_MENU BUTTON_PLAY |
@@ -430,7 +419,7 @@ | |||
430 | #define LABEL_MENU "PLAY" | 419 | #define LABEL_MENU "PLAY" |
431 | #define LABEL_VOLUME "VOL UP/DN" | 420 | #define LABEL_VOLUME "VOL UP/DN" |
432 | 421 | ||
433 | #elif (CONFIG_KEYPAD == IHIFI_770_PAD) | 422 | #elif (CONFIG_KEYPAD == IHIFI_770_PAD) || (CONFIG_KEYPAD == IHIFI_800_PAD) |
434 | #define VUMETER_QUIT BUTTON_POWER | 423 | #define VUMETER_QUIT BUTTON_POWER |
435 | #define VUMETER_HELP BUTTON_HOME | 424 | #define VUMETER_HELP BUTTON_HOME |
436 | #define VUMETER_MENU BUTTON_PLAY | 425 | #define VUMETER_MENU BUTTON_PLAY |
@@ -441,15 +430,15 @@ | |||
441 | #define LABEL_MENU "PLAY" | 430 | #define LABEL_MENU "PLAY" |
442 | #define LABEL_VOLUME "VOL UP/DN" | 431 | #define LABEL_VOLUME "VOL UP/DN" |
443 | 432 | ||
444 | #elif (CONFIG_KEYPAD == IHIFI_800_PAD) | 433 | #elif (CONFIG_KEYPAD == EROSQ_PAD) |
445 | #define VUMETER_QUIT BUTTON_POWER | 434 | #define VUMETER_QUIT BUTTON_POWER |
446 | #define VUMETER_HELP BUTTON_HOME | 435 | #define VUMETER_HELP BUTTON_BACK |
447 | #define VUMETER_MENU BUTTON_PLAY | 436 | #define VUMETER_MENU BUTTON_MENU |
448 | #define VUMETER_UP BUTTON_VOL_UP | 437 | #define VUMETER_UP BUTTON_VOL_UP |
449 | #define VUMETER_DOWN BUTTON_VOL_DOWN | 438 | #define VUMETER_DOWN BUTTON_VOL_DOWN |
450 | #define LABEL_HELP "HOME" | 439 | #define LABEL_HELP "BACK" |
451 | #define LABEL_QUIT "POWER" | 440 | #define LABEL_QUIT "POWER" |
452 | #define LABEL_MENU "PLAY" | 441 | #define LABEL_MENU "MENU" |
453 | #define LABEL_VOLUME "VOL UP/DN" | 442 | #define LABEL_VOLUME "VOL UP/DN" |
454 | 443 | ||
455 | #else | 444 | #else |
@@ -551,7 +540,7 @@ struct saved_settings { | |||
551 | bool analog_minimeters; | 540 | bool analog_minimeters; |
552 | bool digital_minimeters; | 541 | bool digital_minimeters; |
553 | int analog_decay; | 542 | int analog_decay; |
554 | int digital_decay; | 543 | int digital_decay; |
555 | } vumeter_settings; | 544 | } vumeter_settings; |
556 | 545 | ||
557 | static void reset_settings(void) { | 546 | static void reset_settings(void) { |
@@ -561,7 +550,7 @@ static void reset_settings(void) { | |||
561 | vumeter_settings.analog_minimeters=true; | 550 | vumeter_settings.analog_minimeters=true; |
562 | vumeter_settings.digital_minimeters=false; | 551 | vumeter_settings.digital_minimeters=false; |
563 | vumeter_settings.analog_decay=3; | 552 | vumeter_settings.analog_decay=3; |
564 | vumeter_settings.digital_decay=0; | 553 | vumeter_settings.digital_decay=0; |
565 | } | 554 | } |
566 | 555 | ||
567 | static void calc_scales(void) | 556 | static void calc_scales(void) |
@@ -639,11 +628,11 @@ static bool vu_meter_menu(void) | |||
639 | int selection; | 628 | int selection; |
640 | bool menu_quit = false; | 629 | bool menu_quit = false; |
641 | bool exit = false; | 630 | bool exit = false; |
642 | 631 | ||
643 | MENUITEM_STRINGLIST(menu,"VU Meter Menu",NULL,"Meter Type","Scale", | 632 | MENUITEM_STRINGLIST(menu,"VU Meter Menu",NULL,"Meter Type","Scale", |
644 | "Minimeters","Decay Speed","Playback Control", | 633 | "Minimeters","Decay Speed","Playback Control", |
645 | "Quit"); | 634 | "Quit"); |
646 | 635 | ||
647 | static const struct opt_items meter_type_option[2] = { | 636 | static const struct opt_items meter_type_option[2] = { |
648 | { "Analog", -1 }, | 637 | { "Analog", -1 }, |
649 | { "Digital", -1 }, | 638 | { "Digital", -1 }, |
@@ -666,7 +655,7 @@ static bool vu_meter_menu(void) | |||
666 | rb->set_option("Meter Type", &vumeter_settings.meter_type, INT, | 655 | rb->set_option("Meter Type", &vumeter_settings.meter_type, INT, |
667 | meter_type_option, 2, NULL); | 656 | meter_type_option, 2, NULL); |
668 | break; | 657 | break; |
669 | 658 | ||
670 | case 1: | 659 | case 1: |
671 | if(vumeter_settings.meter_type==ANALOG) | 660 | if(vumeter_settings.meter_type==ANALOG) |
672 | { | 661 | { |
@@ -679,7 +668,7 @@ static bool vu_meter_menu(void) | |||
679 | "dBfs", -1, "Linear", -1, NULL); | 668 | "dBfs", -1, "Linear", -1, NULL); |
680 | } | 669 | } |
681 | break; | 670 | break; |
682 | 671 | ||
683 | case 2: | 672 | case 2: |
684 | if(vumeter_settings.meter_type==ANALOG) | 673 | if(vumeter_settings.meter_type==ANALOG) |
685 | { | 674 | { |
@@ -692,16 +681,16 @@ static bool vu_meter_menu(void) | |||
692 | &vumeter_settings.digital_minimeters); | 681 | &vumeter_settings.digital_minimeters); |
693 | } | 682 | } |
694 | break; | 683 | break; |
695 | 684 | ||
696 | case 3: | 685 | case 3: |
697 | if(vumeter_settings.meter_type==ANALOG) | 686 | if(vumeter_settings.meter_type==ANALOG) |
698 | { | 687 | { |
699 | rb->set_option("Decay Speed", &vumeter_settings.analog_decay, INT, | 688 | rb->set_option("Decay Speed", &vumeter_settings.analog_decay, INT, |
700 | decay_speed_option, 7, NULL); | 689 | decay_speed_option, 7, NULL); |
701 | } | 690 | } |
702 | else | 691 | else |
703 | { | 692 | { |
704 | rb->set_option("Decay Speed", &vumeter_settings.digital_decay, INT, | 693 | rb->set_option("Decay Speed", &vumeter_settings.digital_decay, INT, |
705 | decay_speed_option, 7, NULL); | 694 | decay_speed_option, 7, NULL); |
706 | } | 695 | } |
707 | break; | 696 | break; |
@@ -779,7 +768,7 @@ static void draw_digital_minimeters(void) { | |||
779 | if(8<(num_right_leds)) | 768 | if(8<(num_right_leds)) |
780 | rb->lcd_mono_bitmap(sound_max_level, 46, half_height+8, 3, 8); | 769 | rb->lcd_mono_bitmap(sound_max_level, 46, half_height+8, 3, 8); |
781 | rb->lcd_set_drawmode(DRMODE_SOLID); | 770 | rb->lcd_set_drawmode(DRMODE_SOLID); |
782 | 771 | ||
783 | #ifdef HAVE_LCD_COLOR | 772 | #ifdef HAVE_LCD_COLOR |
784 | rb->lcd_set_foreground(screen_foreground); | 773 | rb->lcd_set_foreground(screen_foreground); |
785 | #endif | 774 | #endif |
@@ -880,10 +869,10 @@ static void digital_meter(void) { | |||
880 | rb->lcd_set_foreground(LCD_RGBPACK(255, 255 - 23 * i, 0)); | 869 | rb->lcd_set_foreground(LCD_RGBPACK(255, 255 - 23 * i, 0)); |
881 | #endif | 870 | #endif |
882 | rb->lcd_fillrect((digital_lead + (i*digital_block_width)), | 871 | rb->lcd_fillrect((digital_lead + (i*digital_block_width)), |
883 | (half_height + 20), digital_block_width - digital_block_gap, | 872 | (half_height + 20), digital_block_width - digital_block_gap, |
884 | digital_block_height); | 873 | digital_block_height); |
885 | } | 874 | } |
886 | 875 | ||
887 | #ifdef HAVE_LCD_COLOR | 876 | #ifdef HAVE_LCD_COLOR |
888 | rb->lcd_set_foreground(screen_foreground); | 877 | rb->lcd_set_foreground(screen_foreground); |
889 | #endif | 878 | #endif |