summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schirrmacher <vdr.skinflatplus@schirrmacher.eu>2014-08-03 22:19:06 +0200
committerMartin Schirrmacher <vdr.skinflatplus@schirrmacher.eu>2014-08-03 22:19:06 +0200
commit295552e49b7a5b61b6f3e5064524fe626e757380 (patch)
treea7cdf08bdfb1c403d128832a15a727b80d21c98b
parent2ad9f95b7b23c222fff5fc6566d711e2f8d4f595 (diff)
downloadskin-flatplus-295552e49b7a5b61b6f3e5064524fe626e757380.tar.gz
skin-flatplus-295552e49b7a5b61b6f3e5064524fe626e757380.tar.bz2
add new option TopBar clock font scale, add new option Draw small seconds, add new option Show video/audio bitrate, fix wrong margin of folder icon in recordings menu
-rw-r--r--HISTORY4
-rw-r--r--MV_Themes.HISTORY5
-rw-r--r--MV_Themes.INFO4
-rw-r--r--Makefile2
-rw-r--r--baserender.c10
-rw-r--r--baserender.h4
-rw-r--r--config.c8
-rw-r--r--config.h5
-rwxr-xr-xcontrib/flatPlus_MV_Update.sh60
-rw-r--r--displaychannel.c92
-rw-r--r--displaychannel.h12
-rw-r--r--displayreplay.c91
-rw-r--r--displayreplay.h5
-rw-r--r--femonreceiver.c185
-rw-r--r--femonreceiver.h62
-rw-r--r--icons/MVBerry/changroup.pngbin2062 -> 2062 bytes
-rw-r--r--icons/MVBerry/forward_sel.pngbin3015 -> 3015 bytes
-rw-r--r--icons/MVBerry/pause_sel.pngbin2739 -> 2739 bytes
-rw-r--r--icons/MVBerry/play_sel.pngbin3585 -> 3585 bytes
-rw-r--r--icons/MVBerry/prev_sel.pngbin4141 -> 4141 bytes
-rw-r--r--icons/MVBerry/recording_cutted.pngbin1887 -> 1887 bytes
-rw-r--r--icons/MVBerry/recording_cutted_extra.pngbin1973 -> 1973 bytes
-rw-r--r--icons/MVBerry/recording_new.pngbin7411 -> 7411 bytes
-rw-r--r--icons/MVBerry/rewind_sel.pngbin3082 -> 3082 bytes
-rw-r--r--icons/MVBerry/skip_sel.pngbin4158 -> 4158 bytes
-rw-r--r--icons/MVBerry/timer_full.pngbin3314 -> 3314 bytes
-rw-r--r--icons/MVBerry/timer_partial.pngbin1495 -> 1495 bytes
-rw-r--r--icons/MVBerry/vps.pngbin3348 -> 3348 bytes
-rw-r--r--icons/MVBlood/changroup.pngbin2062 -> 2062 bytes
-rw-r--r--icons/MVBlood/forward_sel.pngbin2302 -> 2302 bytes
-rw-r--r--icons/MVBlood/pause_sel.pngbin2865 -> 2865 bytes
-rw-r--r--icons/MVBlood/play_sel.pngbin3333 -> 3333 bytes
-rw-r--r--icons/MVBlood/prev_sel.pngbin3724 -> 3724 bytes
-rw-r--r--icons/MVBlood/recording_cutted.pngbin1887 -> 1887 bytes
-rw-r--r--icons/MVBlood/recording_cutted_extra.pngbin1973 -> 1973 bytes
-rw-r--r--icons/MVBlood/recording_new.pngbin6880 -> 6880 bytes
-rw-r--r--icons/MVBlood/rewind_sel.pngbin2320 -> 2320 bytes
-rw-r--r--icons/MVBlood/skip_sel.pngbin3326 -> 3326 bytes
-rw-r--r--icons/MVBlood/timer_full.pngbin3314 -> 3314 bytes
-rw-r--r--icons/MVBlood/timer_partial.pngbin1495 -> 1495 bytes
-rw-r--r--icons/MVBlood/vps.pngbin3348 -> 3348 bytes
-rw-r--r--icons/MVBlue/changroup.pngbin2062 -> 2062 bytes
-rw-r--r--icons/MVBlue/forward_sel.pngbin2916 -> 2916 bytes
-rw-r--r--icons/MVBlue/pause_sel.pngbin2720 -> 2720 bytes
-rw-r--r--icons/MVBlue/play_sel.pngbin3450 -> 3450 bytes
-rw-r--r--icons/MVBlue/prev_sel.pngbin4049 -> 4049 bytes
-rw-r--r--icons/MVBlue/recording_cutted.pngbin1887 -> 1887 bytes
-rw-r--r--icons/MVBlue/recording_cutted_extra.pngbin1973 -> 1973 bytes
-rw-r--r--icons/MVBlue/recording_new.pngbin7310 -> 7310 bytes
-rw-r--r--icons/MVBlue/rewind_sel.pngbin2950 -> 2950 bytes
-rw-r--r--icons/MVBlue/skip_sel.pngbin3994 -> 3994 bytes
-rw-r--r--icons/MVBlue/timer_full.pngbin3314 -> 3314 bytes
-rw-r--r--icons/MVBlue/timer_partial.pngbin1495 -> 1495 bytes
-rw-r--r--icons/MVBlue/vps.pngbin3348 -> 3348 bytes
-rw-r--r--icons/MVCappuchino/changroup.pngbin2062 -> 2062 bytes
-rw-r--r--icons/MVCappuchino/forward_sel.pngbin3147 -> 3147 bytes
-rw-r--r--icons/MVCappuchino/pause_sel.pngbin2911 -> 2911 bytes
-rw-r--r--icons/MVCappuchino/play_sel.pngbin3805 -> 3805 bytes
-rw-r--r--icons/MVCappuchino/prev_sel.pngbin4469 -> 4469 bytes
-rw-r--r--icons/MVCappuchino/recording_cutted.pngbin1887 -> 1887 bytes
-rw-r--r--icons/MVCappuchino/recording_cutted_extra.pngbin1973 -> 1973 bytes
-rw-r--r--icons/MVCappuchino/recording_new.pngbin7731 -> 7731 bytes
-rw-r--r--icons/MVCappuchino/rewind_sel.pngbin3217 -> 3217 bytes
-rw-r--r--icons/MVCappuchino/skip_sel.pngbin4401 -> 4401 bytes
-rw-r--r--icons/MVCappuchino/timer_full.pngbin3314 -> 3314 bytes
-rw-r--r--icons/MVCappuchino/timer_partial.pngbin1495 -> 1495 bytes
-rw-r--r--icons/MVCappuchino/vps.pngbin3348 -> 3348 bytes
-rw-r--r--icons/MVChocolate/changroup.pngbin2062 -> 2062 bytes
-rw-r--r--icons/MVChocolate/forward_sel.pngbin2456 -> 2456 bytes
-rw-r--r--icons/MVChocolate/pause_sel.pngbin2700 -> 2700 bytes
-rw-r--r--icons/MVChocolate/play_sel.pngbin3608 -> 3608 bytes
-rw-r--r--icons/MVChocolate/prev_sel.pngbin4156 -> 4156 bytes
-rw-r--r--icons/MVChocolate/recording_cutted.pngbin1887 -> 1887 bytes
-rw-r--r--icons/MVChocolate/recording_cutted_extra.pngbin1973 -> 1973 bytes
-rw-r--r--icons/MVChocolate/recording_new.pngbin7425 -> 7425 bytes
-rw-r--r--icons/MVChocolate/rewind_sel.pngbin2473 -> 2473 bytes
-rw-r--r--icons/MVChocolate/skip_sel.pngbin4127 -> 4127 bytes
-rw-r--r--icons/MVChocolate/timer_full.pngbin3314 -> 3314 bytes
-rw-r--r--icons/MVChocolate/timer_partial.pngbin1495 -> 1495 bytes
-rw-r--r--icons/MVChocolate/vps.pngbin3348 -> 3348 bytes
-rw-r--r--icons/MVCyan/changroup.pngbin2062 -> 2062 bytes
-rw-r--r--icons/MVCyan/forward_sel.pngbin3116 -> 3116 bytes
-rw-r--r--icons/MVCyan/pause_sel.pngbin2912 -> 2912 bytes
-rw-r--r--icons/MVCyan/play_sel.pngbin3777 -> 3777 bytes
-rw-r--r--icons/MVCyan/prev_sel.pngbin4369 -> 4369 bytes
-rw-r--r--icons/MVCyan/recording_cutted.pngbin1887 -> 1887 bytes
-rw-r--r--icons/MVCyan/recording_cutted_extra.pngbin1973 -> 1973 bytes
-rw-r--r--icons/MVCyan/recording_new.pngbin7667 -> 7667 bytes
-rw-r--r--icons/MVCyan/rewind_sel.pngbin3220 -> 3220 bytes
-rw-r--r--icons/MVCyan/skip_sel.pngbin4382 -> 4382 bytes
-rw-r--r--icons/MVCyan/timer_full.pngbin3314 -> 3314 bytes
-rw-r--r--icons/MVCyan/timer_partial.pngbin1495 -> 1495 bytes
-rw-r--r--icons/MVCyan/vps.pngbin3348 -> 3348 bytes
-rw-r--r--icons/MVDeepBlue/changroup.pngbin2062 -> 2062 bytes
-rw-r--r--icons/MVDeepBlue/forward_sel.pngbin2923 -> 2923 bytes
-rw-r--r--icons/MVDeepBlue/pause_sel.pngbin2685 -> 2685 bytes
-rw-r--r--icons/MVDeepBlue/play_sel.pngbin3534 -> 3534 bytes
-rw-r--r--icons/MVDeepBlue/prev_sel.pngbin4047 -> 4047 bytes
-rw-r--r--icons/MVDeepBlue/recording_cutted.pngbin1887 -> 1887 bytes
-rw-r--r--icons/MVDeepBlue/recording_cutted_extra.pngbin1973 -> 1973 bytes
-rw-r--r--icons/MVDeepBlue/recording_new.pngbin7313 -> 7313 bytes
-rw-r--r--icons/MVDeepBlue/rewind_sel.pngbin3032 -> 3032 bytes
-rw-r--r--icons/MVDeepBlue/skip_sel.pngbin4012 -> 4012 bytes
-rw-r--r--icons/MVDeepBlue/timer_full.pngbin3314 -> 3314 bytes
-rw-r--r--icons/MVDeepBlue/timer_partial.pngbin1490 -> 1490 bytes
-rw-r--r--icons/MVDeepBlue/vps.pngbin3348 -> 3348 bytes
-rw-r--r--icons/MVFog/changroup.pngbin1913 -> 1913 bytes
-rw-r--r--icons/MVFog/forward_sel.pngbin1842 -> 1842 bytes
-rw-r--r--icons/MVFog/pause_sel.pngbin1999 -> 1999 bytes
-rw-r--r--icons/MVFog/play_sel.pngbin2147 -> 2147 bytes
-rw-r--r--icons/MVFog/prev_sel.pngbin2504 -> 2504 bytes
-rw-r--r--icons/MVFog/recording_cutted.pngbin1487 -> 1487 bytes
-rw-r--r--icons/MVFog/recording_cutted_extra.pngbin1540 -> 1540 bytes
-rw-r--r--icons/MVFog/recording_new.pngbin3417 -> 3417 bytes
-rw-r--r--icons/MVFog/rewind_sel.pngbin1879 -> 1879 bytes
-rw-r--r--icons/MVFog/skip_sel.pngbin2469 -> 2469 bytes
-rw-r--r--icons/MVFog/timer_full.pngbin3143 -> 3143 bytes
-rw-r--r--icons/MVFog/timer_partial.pngbin1337 -> 1337 bytes
-rw-r--r--icons/MVFog/vps.pngbin3229 -> 3229 bytes
-rw-r--r--icons/MVGrapefruit/changroup.pngbin2062 -> 2062 bytes
-rw-r--r--icons/MVGrapefruit/forward_sel.pngbin2446 -> 2446 bytes
-rw-r--r--icons/MVGrapefruit/pause_sel.pngbin2758 -> 2758 bytes
-rw-r--r--icons/MVGrapefruit/play_sel.pngbin3665 -> 3665 bytes
-rw-r--r--icons/MVGrapefruit/prev_sel.pngbin4187 -> 4187 bytes
-rw-r--r--icons/MVGrapefruit/recording_cutted.pngbin1887 -> 1887 bytes
-rw-r--r--icons/MVGrapefruit/recording_cutted_extra.pngbin1973 -> 1973 bytes
-rw-r--r--icons/MVGrapefruit/recording_new.pngbin7504 -> 7504 bytes
-rw-r--r--icons/MVGrapefruit/rewind_sel.pngbin2464 -> 2464 bytes
-rw-r--r--icons/MVGrapefruit/skip_sel.pngbin4140 -> 4140 bytes
-rw-r--r--icons/MVGrapefruit/timer_full.pngbin3314 -> 3314 bytes
-rw-r--r--icons/MVGrapefruit/timer_partial.pngbin1495 -> 1495 bytes
-rw-r--r--icons/MVGrapefruit/vps.pngbin3348 -> 3348 bytes
-rw-r--r--icons/MVGreen/changroup.pngbin2062 -> 2062 bytes
-rw-r--r--icons/MVGreen/forward_sel.pngbin2196 -> 2196 bytes
-rw-r--r--icons/MVGreen/pause_sel.pngbin2656 -> 2656 bytes
-rw-r--r--icons/MVGreen/play_sel.pngbin2564 -> 2564 bytes
-rw-r--r--icons/MVGreen/prev_sel.pngbin3125 -> 3125 bytes
-rw-r--r--icons/MVGreen/recording_cutted.pngbin1887 -> 1887 bytes
-rw-r--r--icons/MVGreen/recording_cutted_extra.pngbin1973 -> 1973 bytes
-rw-r--r--icons/MVGreen/recording_new.pngbin6017 -> 6017 bytes
-rw-r--r--icons/MVGreen/rewind_sel.pngbin2207 -> 2207 bytes
-rw-r--r--icons/MVGreen/skip_sel.pngbin3143 -> 3143 bytes
-rw-r--r--icons/MVGreen/timer_full.pngbin3314 -> 3314 bytes
-rw-r--r--icons/MVGreen/timer_partial.pngbin1495 -> 1495 bytes
-rw-r--r--icons/MVGreen/vps.pngbin3348 -> 3348 bytes
-rw-r--r--icons/MVGreen2/changroup.pngbin2062 -> 2062 bytes
-rw-r--r--icons/MVGreen2/forward_sel.pngbin2196 -> 2196 bytes
-rw-r--r--icons/MVGreen2/pause_sel.pngbin2656 -> 2656 bytes
-rw-r--r--icons/MVGreen2/play_sel.pngbin2564 -> 2564 bytes
-rw-r--r--icons/MVGreen2/prev_sel.pngbin3125 -> 3125 bytes
-rw-r--r--icons/MVGreen2/recording_cutted.pngbin1887 -> 1887 bytes
-rw-r--r--icons/MVGreen2/recording_cutted_extra.pngbin1973 -> 1973 bytes
-rw-r--r--icons/MVGreen2/recording_new.pngbin6017 -> 6017 bytes
-rw-r--r--icons/MVGreen2/rewind_sel.pngbin2207 -> 2207 bytes
-rw-r--r--icons/MVGreen2/skip_sel.pngbin3143 -> 3143 bytes
-rw-r--r--icons/MVGreen2/timer_full.pngbin3314 -> 3314 bytes
-rw-r--r--icons/MVGreen2/timer_partial.pngbin1495 -> 1495 bytes
-rw-r--r--icons/MVGreen2/vps.pngbin3348 -> 3348 bytes
-rw-r--r--icons/MVGrey/changroup.pngbin2062 -> 2062 bytes
-rw-r--r--icons/MVGrey/forward_sel.pngbin3180 -> 3180 bytes
-rw-r--r--icons/MVGrey/pause_sel.pngbin2901 -> 2901 bytes
-rw-r--r--icons/MVGrey/play_sel.pngbin3847 -> 3847 bytes
-rw-r--r--icons/MVGrey/prev_sel.pngbin4513 -> 4513 bytes
-rw-r--r--icons/MVGrey/recording_cutted.pngbin1887 -> 1887 bytes
-rw-r--r--icons/MVGrey/recording_cutted_extra.pngbin1973 -> 1973 bytes
-rw-r--r--icons/MVGrey/recording_new.pngbin7733 -> 7733 bytes
-rw-r--r--icons/MVGrey/rewind_sel.pngbin3254 -> 3254 bytes
-rw-r--r--icons/MVGrey/skip_sel.pngbin4454 -> 4454 bytes
-rw-r--r--icons/MVGrey/timer_full.pngbin3314 -> 3314 bytes
-rw-r--r--icons/MVGrey/timer_partial.pngbin1490 -> 1490 bytes
-rw-r--r--icons/MVGrey/vps.pngbin3348 -> 3348 bytes
-rw-r--r--icons/MVHelloKitty/changroup.pngbin2062 -> 2062 bytes
-rw-r--r--icons/MVHelloKitty/forward_sel.pngbin3392 -> 3392 bytes
-rw-r--r--icons/MVHelloKitty/pause_sel.pngbin3332 -> 3332 bytes
-rw-r--r--icons/MVHelloKitty/play_sel.pngbin4204 -> 4204 bytes
-rw-r--r--icons/MVHelloKitty/prev_sel.pngbin5088 -> 5088 bytes
-rw-r--r--icons/MVHelloKitty/recording_cutted.pngbin1887 -> 1887 bytes
-rw-r--r--icons/MVHelloKitty/recording_cutted_extra.pngbin1973 -> 1973 bytes
-rw-r--r--icons/MVHelloKitty/recording_new.pngbin8359 -> 8359 bytes
-rw-r--r--icons/MVHelloKitty/rewind_sel.pngbin3551 -> 3551 bytes
-rw-r--r--icons/MVHelloKitty/skip_sel.pngbin4983 -> 4983 bytes
-rw-r--r--icons/MVHelloKitty/timer_full.pngbin3314 -> 3314 bytes
-rw-r--r--icons/MVHelloKitty/timer_partial.pngbin1495 -> 1495 bytes
-rw-r--r--icons/MVHelloKitty/vps.pngbin3348 -> 3348 bytes
-rw-r--r--icons/MVHelloKitty2/changroup.pngbin2062 -> 2062 bytes
-rw-r--r--icons/MVHelloKitty2/forward_sel.pngbin3392 -> 3392 bytes
-rw-r--r--icons/MVHelloKitty2/pause_sel.pngbin3332 -> 3332 bytes
-rw-r--r--icons/MVHelloKitty2/play_sel.pngbin4204 -> 4204 bytes
-rw-r--r--icons/MVHelloKitty2/prev_sel.pngbin5088 -> 5088 bytes
-rw-r--r--icons/MVHelloKitty2/recording_cutted.pngbin1887 -> 1887 bytes
-rw-r--r--icons/MVHelloKitty2/recording_cutted_extra.pngbin1973 -> 1973 bytes
-rw-r--r--icons/MVHelloKitty2/recording_new.pngbin8359 -> 8359 bytes
-rw-r--r--icons/MVHelloKitty2/rewind_sel.pngbin3551 -> 3551 bytes
-rw-r--r--icons/MVHelloKitty2/skip_sel.pngbin4983 -> 4983 bytes
-rw-r--r--icons/MVHelloKitty2/timer_full.pngbin3314 -> 3314 bytes
-rw-r--r--icons/MVHelloKitty2/timer_partial.pngbin1495 -> 1495 bytes
-rw-r--r--icons/MVHelloKitty2/vps.pngbin3348 -> 3348 bytes
-rw-r--r--icons/MVLightBlue/changroup.pngbin2062 -> 2062 bytes
-rw-r--r--icons/MVLightBlue/forward_sel.pngbin3165 -> 3165 bytes
-rw-r--r--icons/MVLightBlue/pause_sel.pngbin3028 -> 3028 bytes
-rw-r--r--icons/MVLightBlue/play_sel.pngbin3900 -> 3900 bytes
-rw-r--r--icons/MVLightBlue/prev_sel.pngbin4538 -> 4538 bytes
-rw-r--r--icons/MVLightBlue/recording_cutted.pngbin1887 -> 1887 bytes
-rw-r--r--icons/MVLightBlue/recording_cutted_extra.pngbin1973 -> 1973 bytes
-rw-r--r--icons/MVLightBlue/recording_new.pngbin7912 -> 7912 bytes
-rw-r--r--icons/MVLightBlue/rewind_sel.pngbin3299 -> 3299 bytes
-rw-r--r--icons/MVLightBlue/skip_sel.pngbin4551 -> 4551 bytes
-rw-r--r--icons/MVLightBlue/timer_full.pngbin3314 -> 3314 bytes
-rw-r--r--icons/MVLightBlue/timer_partial.pngbin1495 -> 1495 bytes
-rw-r--r--icons/MVLightBlue/vps.pngbin3348 -> 3348 bytes
-rw-r--r--icons/MVLightGreen/changroup.pngbin2062 -> 2062 bytes
-rw-r--r--icons/MVLightGreen/forward_sel.pngbin2456 -> 2456 bytes
-rw-r--r--icons/MVLightGreen/pause_sel.pngbin2792 -> 2792 bytes
-rw-r--r--icons/MVLightGreen/play_sel.pngbin3694 -> 3694 bytes
-rw-r--r--icons/MVLightGreen/prev_sel.pngbin4258 -> 4258 bytes
-rw-r--r--icons/MVLightGreen/recording_cutted.pngbin1887 -> 1887 bytes
-rw-r--r--icons/MVLightGreen/recording_cutted_extra.pngbin1973 -> 1973 bytes
-rw-r--r--icons/MVLightGreen/recording_new.pngbin7479 -> 7479 bytes
-rw-r--r--icons/MVLightGreen/rewind_sel.pngbin2469 -> 2469 bytes
-rw-r--r--icons/MVLightGreen/skip_sel.pngbin4206 -> 4206 bytes
-rw-r--r--icons/MVLightGreen/timer_full.pngbin3314 -> 3314 bytes
-rw-r--r--icons/MVLightGreen/timer_partial.pngbin1495 -> 1495 bytes
-rw-r--r--icons/MVLightGreen/vps.pngbin3348 -> 3348 bytes
-rw-r--r--icons/MVMint/changroup.pngbin2062 -> 2062 bytes
-rw-r--r--icons/MVMint/forward_sel.pngbin2579 -> 2579 bytes
-rw-r--r--icons/MVMint/pause_sel.pngbin2883 -> 2883 bytes
-rw-r--r--icons/MVMint/play_sel.pngbin3619 -> 3619 bytes
-rw-r--r--icons/MVMint/prev_sel.pngbin4321 -> 4321 bytes
-rw-r--r--icons/MVMint/recording_cutted.pngbin1887 -> 1887 bytes
-rw-r--r--icons/MVMint/recording_cutted_extra.pngbin1973 -> 1973 bytes
-rw-r--r--icons/MVMint/recording_new.pngbin7442 -> 7442 bytes
-rw-r--r--icons/MVMint/rewind_sel.pngbin2584 -> 2584 bytes
-rw-r--r--icons/MVMint/skip_sel.pngbin4251 -> 4251 bytes
-rw-r--r--icons/MVMint/timer_full.pngbin3314 -> 3314 bytes
-rw-r--r--icons/MVMint/timer_partial.pngbin1495 -> 1495 bytes
-rw-r--r--icons/MVMint/vps.pngbin3348 -> 3348 bytes
-rw-r--r--icons/MVNuts/changroup.pngbin2062 -> 2062 bytes
-rw-r--r--icons/MVNuts/forward_sel.pngbin3114 -> 3114 bytes
-rw-r--r--icons/MVNuts/pause_sel.pngbin2947 -> 2947 bytes
-rw-r--r--icons/MVNuts/play_sel.pngbin3773 -> 3773 bytes
-rw-r--r--icons/MVNuts/prev_sel.pngbin4446 -> 4446 bytes
-rw-r--r--icons/MVNuts/recording_cutted.pngbin1887 -> 1887 bytes
-rw-r--r--icons/MVNuts/recording_cutted_extra.pngbin1973 -> 1973 bytes
-rw-r--r--icons/MVNuts/recording_new.pngbin7699 -> 7699 bytes
-rw-r--r--icons/MVNuts/rewind_sel.pngbin3211 -> 3211 bytes
-rw-r--r--icons/MVNuts/skip_sel.pngbin4426 -> 4426 bytes
-rw-r--r--icons/MVNuts/timer_full.pngbin3314 -> 3314 bytes
-rw-r--r--icons/MVNuts/timer_partial.pngbin1495 -> 1495 bytes
-rw-r--r--icons/MVNuts/vps.pngbin3348 -> 3348 bytes
-rw-r--r--icons/MVOlive/changroup.pngbin2062 -> 2062 bytes
-rw-r--r--icons/MVOlive/forward_sel.pngbin3163 -> 3163 bytes
-rw-r--r--icons/MVOlive/pause_sel.pngbin2900 -> 2900 bytes
-rw-r--r--icons/MVOlive/play_sel.pngbin3833 -> 3833 bytes
-rw-r--r--icons/MVOlive/prev_sel.pngbin4493 -> 4493 bytes
-rw-r--r--icons/MVOlive/recording_cutted.pngbin1887 -> 1887 bytes
-rw-r--r--icons/MVOlive/recording_cutted_extra.pngbin1973 -> 1973 bytes
-rw-r--r--icons/MVOlive/recording_new.pngbin7739 -> 7739 bytes
-rw-r--r--icons/MVOlive/rewind_sel.pngbin3265 -> 3265 bytes
-rw-r--r--icons/MVOlive/skip_sel.pngbin4405 -> 4405 bytes
-rw-r--r--icons/MVOlive/timer_full.pngbin3314 -> 3314 bytes
-rw-r--r--icons/MVOlive/timer_partial.pngbin1495 -> 1495 bytes
-rw-r--r--icons/MVOlive/vps.pngbin3348 -> 3348 bytes
-rw-r--r--icons/MVPflaume/changroup.pngbin2062 -> 2062 bytes
-rw-r--r--icons/MVPflaume/forward_sel.pngbin2953 -> 2953 bytes
-rw-r--r--icons/MVPflaume/pause_sel.pngbin2779 -> 2779 bytes
-rw-r--r--icons/MVPflaume/play_sel.pngbin3561 -> 3561 bytes
-rw-r--r--icons/MVPflaume/prev_sel.pngbin4119 -> 4119 bytes
-rw-r--r--icons/MVPflaume/recording_cutted.pngbin1887 -> 1887 bytes
-rw-r--r--icons/MVPflaume/recording_cutted_extra.pngbin1973 -> 1973 bytes
-rw-r--r--icons/MVPflaume/recording_new.pngbin7381 -> 7381 bytes
-rw-r--r--icons/MVPflaume/rewind_sel.pngbin3044 -> 3044 bytes
-rw-r--r--icons/MVPflaume/skip_sel.pngbin4115 -> 4115 bytes
-rw-r--r--icons/MVPflaume/timer_full.pngbin3314 -> 3314 bytes
-rw-r--r--icons/MVPflaume/timer_partial.pngbin1495 -> 1495 bytes
-rw-r--r--icons/MVPflaume/vps.pngbin3348 -> 3348 bytes
-rw-r--r--icons/MVPumpkin/changroup.pngbin2062 -> 2062 bytes
-rw-r--r--icons/MVPumpkin/forward_sel.pngbin3165 -> 3165 bytes
-rw-r--r--icons/MVPumpkin/pause_sel.pngbin3013 -> 3013 bytes
-rw-r--r--icons/MVPumpkin/play_sel.pngbin3829 -> 3829 bytes
-rw-r--r--icons/MVPumpkin/prev_sel.pngbin4530 -> 4530 bytes
-rw-r--r--icons/MVPumpkin/recording_cutted.pngbin1887 -> 1887 bytes
-rw-r--r--icons/MVPumpkin/recording_cutted_extra.pngbin1973 -> 1973 bytes
-rw-r--r--icons/MVPumpkin/recording_new.pngbin7773 -> 7773 bytes
-rw-r--r--icons/MVPumpkin/rewind_sel.pngbin3224 -> 3224 bytes
-rw-r--r--icons/MVPumpkin/skip_sel.pngbin4521 -> 4521 bytes
-rw-r--r--icons/MVPumpkin/timer_full.pngbin3314 -> 3314 bytes
-rw-r--r--icons/MVPumpkin/timer_partial.pngbin1495 -> 1495 bytes
-rw-r--r--icons/MVPumpkin/vps.pngbin3348 -> 3348 bytes
-rw-r--r--icons/MVPurple/changroup.pngbin2062 -> 2062 bytes
-rw-r--r--icons/MVPurple/forward_sel.pngbin2980 -> 2980 bytes
-rw-r--r--icons/MVPurple/pause_sel.pngbin2676 -> 2676 bytes
-rw-r--r--icons/MVPurple/play_sel.pngbin3595 -> 3595 bytes
-rw-r--r--icons/MVPurple/prev_sel.pngbin4133 -> 4133 bytes
-rw-r--r--icons/MVPurple/recording_cutted.pngbin1887 -> 1887 bytes
-rw-r--r--icons/MVPurple/recording_cutted_extra.pngbin1973 -> 1973 bytes
-rw-r--r--icons/MVPurple/recording_new.pngbin7396 -> 7396 bytes
-rw-r--r--icons/MVPurple/rewind_sel.pngbin3088 -> 3088 bytes
-rw-r--r--icons/MVPurple/skip_sel.pngbin4083 -> 4083 bytes
-rw-r--r--icons/MVPurple/timer_full.pngbin3314 -> 3314 bytes
-rw-r--r--icons/MVPurple/timer_partial.pngbin1495 -> 1495 bytes
-rw-r--r--icons/MVPurple/vps.pngbin3348 -> 3348 bytes
-rw-r--r--icons/MVPurpleGrey/changroup.pngbin2062 -> 2062 bytes
-rw-r--r--icons/MVPurpleGrey/forward_sel.pngbin3155 -> 3155 bytes
-rw-r--r--icons/MVPurpleGrey/pause_sel.pngbin2948 -> 2948 bytes
-rw-r--r--icons/MVPurpleGrey/play_sel.pngbin3853 -> 3853 bytes
-rw-r--r--icons/MVPurpleGrey/prev_sel.pngbin4531 -> 4531 bytes
-rw-r--r--icons/MVPurpleGrey/recording_cutted.pngbin1887 -> 1887 bytes
-rw-r--r--icons/MVPurpleGrey/recording_cutted_extra.pngbin1973 -> 1973 bytes
-rw-r--r--icons/MVPurpleGrey/recording_new.pngbin7854 -> 7854 bytes
-rw-r--r--icons/MVPurpleGrey/rewind_sel.pngbin3281 -> 3281 bytes
-rw-r--r--icons/MVPurpleGrey/skip_sel.pngbin4460 -> 4460 bytes
-rw-r--r--icons/MVPurpleGrey/timer_full.pngbin3314 -> 3314 bytes
-rw-r--r--icons/MVPurpleGrey/timer_partial.pngbin1495 -> 1495 bytes
-rw-r--r--icons/MVPurpleGrey/vps.pngbin3348 -> 3348 bytes
-rw-r--r--icons/MVRauchglas/changroup.pngbin2062 -> 2062 bytes
-rw-r--r--icons/MVRauchglas/forward_sel.pngbin2456 -> 2456 bytes
-rw-r--r--icons/MVRauchglas/pause_sel.pngbin2700 -> 2700 bytes
-rw-r--r--icons/MVRauchglas/play_sel.pngbin3608 -> 3608 bytes
-rw-r--r--icons/MVRauchglas/prev_sel.pngbin4156 -> 4156 bytes
-rw-r--r--icons/MVRauchglas/recording_cutted.pngbin1887 -> 1887 bytes
-rw-r--r--icons/MVRauchglas/recording_cutted_extra.pngbin1973 -> 1973 bytes
-rw-r--r--icons/MVRauchglas/recording_new.pngbin7425 -> 7425 bytes
-rw-r--r--icons/MVRauchglas/rewind_sel.pngbin2473 -> 2473 bytes
-rw-r--r--icons/MVRauchglas/skip_sel.pngbin4127 -> 4127 bytes
-rw-r--r--icons/MVRauchglas/timer_full.pngbin3314 -> 3314 bytes
-rw-r--r--icons/MVRauchglas/timer_partial.pngbin1495 -> 1495 bytes
-rw-r--r--icons/MVRauchglas/vps.pngbin3348 -> 3348 bytes
-rw-r--r--icons/MVRed/changroup.pngbin2062 -> 2062 bytes
-rw-r--r--icons/MVRed/forward_sel.pngbin2407 -> 2407 bytes
-rw-r--r--icons/MVRed/pause_sel.pngbin2978 -> 2978 bytes
-rw-r--r--icons/MVRed/play_sel.pngbin3268 -> 3268 bytes
-rw-r--r--icons/MVRed/prev_sel.pngbin3760 -> 3760 bytes
-rw-r--r--icons/MVRed/recording_cutted.pngbin1887 -> 1887 bytes
-rw-r--r--icons/MVRed/recording_cutted_extra.pngbin1973 -> 1973 bytes
-rw-r--r--icons/MVRed/recording_new.pngbin6821 -> 6821 bytes
-rw-r--r--icons/MVRed/rewind_sel.pngbin2420 -> 2420 bytes
-rw-r--r--icons/MVRed/skip_sel.pngbin3718 -> 3718 bytes
-rw-r--r--icons/MVRed/timer_full.pngbin3314 -> 3314 bytes
-rw-r--r--icons/MVRed/timer_partial.pngbin1495 -> 1495 bytes
-rw-r--r--icons/MVRed/vps.pngbin3348 -> 3348 bytes
-rw-r--r--icons/MVXMAS/changroup.pngbin2062 -> 2062 bytes
-rw-r--r--icons/MVXMAS/forward_sel.pngbin2403 -> 2403 bytes
-rw-r--r--icons/MVXMAS/pause_sel.pngbin2580 -> 2580 bytes
-rw-r--r--icons/MVXMAS/play_sel.pngbin3391 -> 3391 bytes
-rw-r--r--icons/MVXMAS/prev_sel.pngbin3884 -> 3884 bytes
-rw-r--r--icons/MVXMAS/recording_cutted.pngbin1887 -> 1887 bytes
-rw-r--r--icons/MVXMAS/recording_cutted_extra.pngbin1973 -> 1973 bytes
-rw-r--r--icons/MVXMAS/recording_new.pngbin6990 -> 6990 bytes
-rw-r--r--icons/MVXMAS/rewind_sel.pngbin2421 -> 2421 bytes
-rw-r--r--icons/MVXMAS/skip_sel.pngbin3889 -> 3889 bytes
-rw-r--r--icons/MVXMAS/timer_full.pngbin3314 -> 3314 bytes
-rw-r--r--icons/MVXMAS/timer_partial.pngbin1495 -> 1495 bytes
-rw-r--r--icons/MVXMAS/vps.pngbin3348 -> 3348 bytes
-rw-r--r--icons/MVdefault/169.pngbin1269 -> 1269 bytes
-rw-r--r--icons/MVdefault/221.pngbin920 -> 920 bytes
-rw-r--r--icons/MVdefault/43.pngbin1042 -> 1042 bytes
-rw-r--r--icons/MVdefault/crypted.pngbin462 -> 462 bytes
-rw-r--r--icons/MVdefault/forward.pngbin2122 -> 2122 bytes
-rw-r--r--icons/MVdefault/hd.pngbin1313 -> 1313 bytes
-rw-r--r--icons/MVdefault/pause.pngbin2463 -> 2463 bytes
-rw-r--r--icons/MVdefault/play.pngbin2393 -> 2393 bytes
-rw-r--r--icons/MVdefault/prev.pngbin3161 -> 3161 bytes
-rw-r--r--icons/MVdefault/rewind.pngbin2137 -> 2137 bytes
-rw-r--r--icons/MVdefault/sd.pngbin1624 -> 1624 bytes
-rw-r--r--icons/MVdefault/skip.pngbin3119 -> 3119 bytes
-rw-r--r--icons/MVdefault/uncrypted.pngbin3392 -> 3392 bytes
-rw-r--r--icons/default/folder.pngbin3029 -> 1705 bytes
-rw-r--r--po/de_DE.po11
-rw-r--r--preview/Berry.pngbin0 -> 31714 bytes
-rw-r--r--preview/Blood.pngbin0 -> 31233 bytes
-rw-r--r--preview/Blue.pngbin0 -> 31706 bytes
-rw-r--r--preview/Cappuchino.pngbin0 -> 32543 bytes
-rw-r--r--preview/Chocolate.pngbin0 -> 32300 bytes
-rw-r--r--preview/Cyan.pngbin0 -> 32011 bytes
-rw-r--r--preview/DeepBlue.pngbin0 -> 32238 bytes
-rw-r--r--preview/Fog.pngbin0 -> 32013 bytes
-rw-r--r--preview/Grapefruit.pngbin0 -> 32115 bytes
-rw-r--r--preview/Green.pngbin0 -> 31698 bytes
-rw-r--r--preview/Green2.pngbin0 -> 31871 bytes
-rw-r--r--preview/Grey.pngbin0 -> 32070 bytes
-rw-r--r--preview/HelloKitty.pngbin0 -> 32343 bytes
-rw-r--r--preview/HelloKitty2.pngbin0 -> 30765 bytes
-rw-r--r--preview/LightBlue.pngbin0 -> 32170 bytes
-rw-r--r--preview/LightGreen.pngbin0 -> 32164 bytes
-rw-r--r--preview/Mint.pngbin0 -> 31512 bytes
-rw-r--r--preview/Nuts.pngbin0 -> 31600 bytes
-rw-r--r--preview/Olive.pngbin0 -> 31978 bytes
-rw-r--r--preview/Pflaume.pngbin0 -> 31881 bytes
-rw-r--r--preview/Pumpkin.pngbin0 -> 31826 bytes
-rw-r--r--preview/Purple.pngbin0 -> 31751 bytes
-rw-r--r--preview/PurpleGrey.pngbin0 -> 32577 bytes
-rw-r--r--preview/Rauchglas.pngbin0 -> 32403 bytes
-rw-r--r--preview/Red.pngbin0 -> 31298 bytes
-rw-r--r--preview/XMAS.pngbin0 -> 31860 bytes
-rw-r--r--setup.c6
395 files changed, 533 insertions, 33 deletions
diff --git a/HISTORY b/HISTORY
index 948fe715..807ccbe9 100644
--- a/HISTORY
+++ b/HISTORY
@@ -14,6 +14,9 @@ VDR Plugin 'skinflatplus' Revision History
- [add] new options in general settings for textscroller
- [add] new option "Diskusage free/occupied" to show free or occupied percantage and hours
- [add] new option "Diskusage short display" for only show percantage and free/occupied hours
+- [add] new option "TopBar clock font scale" to scale the clock font
+- [add] new option "Draw small seconds" to draw the seconds small in recording view
+- [add] new option "Show video/audio bitrate" to show the bitrate of audio/video in display channel (lent code from femon, thanks!)
- [add] image _cur version for recording_cutted, recording_new, timer_full, timer_partial, vps
if it is the current/selected menu item the cur version of the image will be loaded
- [add] Support for scrollbar type and size like border and progressbar
@@ -30,6 +33,7 @@ VDR Plugin 'skinflatplus' Revision History
* 7 = round bar
- [update] decor-files for new scrollbar options
- [fix] position in menu item event
+- [fix] wrong margin of folder icon in recordings menu
2014-06-19: Version 0.3.1
- [fix] epg image position on channel info
diff --git a/MV_Themes.HISTORY b/MV_Themes.HISTORY
index 57ad591a..515638ee 100644
--- a/MV_Themes.HISTORY
+++ b/MV_Themes.HISTORY
@@ -86,3 +86,8 @@ HISTORY
passendes '_cur.png' erstellt
- '70_MV_rect_sml.decor' angepasst
- Empfohlene Einstellungen aktualisiert
+ [14.07.2014] - Symbol 'chart1b.png' mit 'chart7.png' verlinkt; Symbole 'chart2b.png'
+ bis 'chart7b.png' mit den default Symbolen 'chart6.png' bis
+ 'chart1.png' verlinkt
+ [02.08.2014] - Vorschaubilder fuer alle Themen im Ordner 'preview'
+ - Icons auch fuer MVGreen erstellt
diff --git a/MV_Themes.INFO b/MV_Themes.INFO
index 17966604..cf990875 100644
--- a/MV_Themes.INFO
+++ b/MV_Themes.INFO
@@ -1,4 +1,4 @@
-flatPlus-MV_Themen erstellt am 12.07.2014 17:44
+flatPlus-MV_Themen erstellt am 03.08.2014 08:44
Basisthema: flatPlus-MVGreen.theme, Basisicons: MVdefault
=> Installationshimnweise am Ende der Datei! <=
@@ -9,7 +9,6 @@ Thema: Fog, Farbe: 111111, Hintergrund: DEDEDE Schriftfarbe: 647887
Thema: Green 2, Farbe: 008A00, Hintergrund: 112211
Thema: HelloKitty 2, Farbe: F472D0, Hintergrund: FF80F0
Thema: HelloKitty, Farbe: F472D0
-Thema: Pumpkin, Farbe: F0A30A
Thema: Rauchglas, Farbe: 825A2C, Hintergrund: 200F02
Thema: XMAS, Farbe: CC1111, Hintergrund: 114511
Thema: Berry, Farbe: A61D4D
@@ -25,6 +24,7 @@ Thema: Mint, Farbe: A4C400
Thema: Nuts, Farbe: BF9217
Thema: Olive, Farbe: 6D8764
Thema: Pflaume, Farbe: 6A00FF
+Thema: Pumpkin, Farbe: F0A30A
Thema: Purple, Farbe: 6C0AAB
Thema: PurpleGrey, Farbe: 76608A
Thema: Red, Farbe: E51400
diff --git a/Makefile b/Makefile
index 8f6a4dd9..394c33a1 100644
--- a/Makefile
+++ b/Makefile
@@ -74,7 +74,7 @@ LIBS += $(shell pkg-config --libs Magick++)
### The object files (add further files here):
-OBJS = config.o setup.o imagecache.o imagescaler.o imagemagickwrapper.o imageloader.o baserender.o complexcontent.o textscroller.o displaychannel.o displaymenu.o displaymessage.o \
+OBJS = config.o setup.o imagecache.o imagescaler.o imagemagickwrapper.o imageloader.o baserender.o complexcontent.o textscroller.o femonreceiver.o displaychannel.o displaymenu.o displaymessage.o \
displayreplay.o displaytracks.o displayvolume.o flat.o $(PLUGIN).o
### The main target:
diff --git a/baserender.c b/baserender.c
index e3325233..1f1de37a 100644
--- a/baserender.c
+++ b/baserender.c
@@ -7,6 +7,7 @@ cFlatBaseRender::cFlatBaseRender(void) {
font = cFont::CreateFont(Setup.FontOsd, Setup.FontOsdSize );
fontSml = cFont::CreateFont(Setup.FontSml, Setup.FontSmlSize);
fontFixed = cFont::CreateFont(Setup.FontFix, Setup.FontFixSize);
+ topBarFontClock = NULL;
fontHeight = font->Height();
fontSmlHeight = fontSml->Height();
@@ -49,6 +50,8 @@ cFlatBaseRender::~cFlatBaseRender(void) {
delete font;
delete fontSml;
delete fontFixed;
+ if( topBarFontClock != NULL )
+ delete topBarFontClock;
if( osd ) {
messageScroller.Clear();
@@ -104,9 +107,11 @@ void cFlatBaseRender::CreateOsd(int left, int top, int width, int height) {
void cFlatBaseRender::TopBarCreate(void) {
int fs = int(round(cOsd::OsdHeight() * Config.TopBarFontSize));
topBarFont = cFont::CreateFont(Setup.FontOsd, fs);
+ topBarFontClock = cFont::CreateFont(Setup.FontOsd, fs * Config.TopBarFontClockScale * 100.0);
topBarFontSml = cFont::CreateFont(Setup.FontOsd, fs / 2);
topBarFontHeight = topBarFont->Height();
topBarFontSmlHeight = topBarFontSml->Height();
+ topBarFontClockHeight = topBarFontClock->Height();
if( topBarFontHeight > topBarFontSmlHeight*2 )
topBarHeight = topBarFontHeight;
@@ -249,6 +254,7 @@ void cFlatBaseRender::TopBarUpdate(void) {
int fontTop = (topBarHeight - topBarFontHeight) / 2;
int fontSmlTop = (topBarHeight - topBarFontSmlHeight*2) / 2;
+ int fontClockTop = (topBarHeight - topBarFontClockHeight) / 2;
topBarPixmap->Fill(Theme.Color(clrTopBarBg));
topBarIconPixmap->Fill(clrTransparent);
@@ -297,9 +303,9 @@ void cFlatBaseRender::TopBarUpdate(void) {
cString time = TimeString(t);
cString time2 = cString::sprintf("%s %s", *time, tr("clock"));
- int timeWidth = topBarFont->Width(*time2) + marginItem*2;
+ int timeWidth = topBarFontClock->Width(*time2) + marginItem*2;
int Right = TopBarWidth - timeWidth;
- topBarPixmap->DrawText(cPoint(Right, fontTop), time2, Theme.Color(clrTopBarTimeFont), Theme.Color(clrTopBarBg), topBarFont);
+ topBarPixmap->DrawText(cPoint(Right, fontClockTop), time2, Theme.Color(clrTopBarTimeFont), Theme.Color(clrTopBarBg), topBarFontClock);
cString weekday = WeekDayNameFull(t);
int weekdayWidth = topBarFontSml->Width(*weekday);
diff --git a/baserender.h b/baserender.h
index 6ed286f4..799def9c 100644
--- a/baserender.h
+++ b/baserender.h
@@ -42,8 +42,8 @@ class cFlatBaseRender
cPixmap *topBarPixmap;
cPixmap *topBarIconPixmap;
cPixmap *topBarIconBGPixmap;
- cFont *topBarFont, *topBarFontSml;
- int topBarFontHeight, topBarFontSmlHeight;
+ cFont *topBarFont, *topBarFontSml, *topBarFontClock;
+ int topBarFontHeight, topBarFontSmlHeight, topBarFontClockHeight;
cString topBarTitle;
cString tobBarTitleExtra1, tobBarTitleExtra2;
diff --git a/config.c b/config.c
index c6ddf476..3983be1f 100644
--- a/config.c
+++ b/config.c
@@ -24,10 +24,13 @@ cFlatConfig::cFlatConfig(void) {
ChannelFormatShow = true;
ChannelResolutionAspectShow = true;
ChannelSimpleAspectFormat = true;
+ ChannelBitrateShow = false;
+ ChannelBitrateShowCalcInterval = 50;
RecordingResolutionAspectShow = true;
RecordingFormatShow = true;
RecordingSimpleAspectFormat = true;
+ RecordingSmallSecs = true;
RecordingAdditionalInfoShow = true;
EpgAdditionalInfoShow = true;
@@ -64,6 +67,8 @@ cFlatConfig::cFlatConfig(void) {
ScrollerDelay = 40;
ScrollerType = 0;
+ TopBarFontClockScale = 0.01;
+
TVScraperChanInfoShowPoster = 1;
TVScraperChanInfoPosterSize = 0.01;
@@ -248,6 +253,9 @@ bool cFlatConfig::SetupParse(const char *Name, const char *Value) {
else if (strcmp(Name, "ScrollerType") == 0) ScrollerType = atoi(Value);
else if (strcmp(Name, "DiskUsageShort") == 0) DiskUsageShort = atoi(Value);
else if (strcmp(Name, "DiskUsageFree") == 0) DiskUsageFree = atoi(Value);
+ else if (strcmp(Name, "ChannelBitrateShow") == 0) ChannelBitrateShow = atoi(Value);
+ else if (strcmp(Name, "TopBarFontClockScale") == 0) TopBarFontClockScale = atod(Value);
+ else if (strcmp(Name, "RecordingSmallSecs") == 0) RecordingSmallSecs = atoi(Value);
else return false;
diff --git a/config.h b/config.h
index 9e4e2be1..b0f03341 100644
--- a/config.h
+++ b/config.h
@@ -190,14 +190,19 @@ class cFlatConfig
int MenuContentFullSize;
double TopBarFontSize;
+ double TopBarFontClockScale;
int ChannelResolutionAspectShow;
int ChannelFormatShow;
int ChannelSimpleAspectFormat;
+ int ChannelBitrateShow;
+ int ChannelBitrateShowCalcInterval;
int RecordingResolutionAspectShow;
int RecordingFormatShow;
int RecordingSimpleAspectFormat;
int RecordingAdditionalInfoShow;
+ int RecordingSmallSecs;
+
int EpgRerunsShow;
int EpgAdditionalInfoShow;
int TopBarRecordingShow;
diff --git a/contrib/flatPlus_MV_Update.sh b/contrib/flatPlus_MV_Update.sh
index 44f8f035..080251a5 100755
--- a/contrib/flatPlus_MV_Update.sh
+++ b/contrib/flatPlus_MV_Update.sh
@@ -9,6 +9,11 @@
ICONS="icons" ; THEMES="themes" ; DECORS="decors"
INFO=MV_Themes.INFO ; HIST=MV_Themes.HISTORY
+# Ordner für Direktupdate (Im aktuellem Filesystem); Beispiel für Gen2VDR
+THEMEDIR="/etc/vdr/themes"
+ICONDIR="/etc/vdr/plugins/skinflatplus/icons"
+DECORDIR="/etc/vdr/plugins/skinflatplus/decors"
+
timedout_read() {
timeout=$1 ; varname=$2 ; old_tty_settings=`stty -g`
stty -icanon min 0 time ${timeout}0
@@ -16,6 +21,15 @@ timedout_read() {
stty "$old_tty_settings" # See man page for "stty."
}
+_help() {
+ echo "-------------------------------"
+ echo "Falscher Parameter: $1"
+ echo "Aufruf mit $(basename $0)"
+ echo "Parameter -Silent Keine Abfragen (Silent Update)."
+ echo "Parameter -Direct Direktes Update der Daten im Filesysten (/etc/vdr)."
+ echo " !!! Speziell für Gen2VDR angepasst !!!"
+ exit
+}
### Start
# In Skriptordner wechseln (contrib)
cd $(dirname $0) # Skript im contrib-Ordner
@@ -25,22 +39,20 @@ if [ ! -d "../$ICONS" -o ! -d "../$THEMES" -o ! -d "../$DECORS" ] ; then
exit 1
fi
+
if [ -n "$1" ] ; then # Parameter wurde übergeben
- if [ "$1" = "-u" -o "$1" = "-U" ] ; then
- SILENTUPDATE=1 ; echo "Silent Update! ($1)"
- else
- echo "-------------------------------"
- echo "Falscher Parameter: $1"
- echo "Aufruf mit $(basename $0)"
- echo "Parameter -u Keine Abfragen (Silent Update)."
- exit
- fi
+ case $1 in
+ -Silent) SILENTUPDATE=1 ; echo "Silent Update! ($1)" ;;
+ -Direct) DIRECTUPDATE=1 ; echo "Direct Update! ($1)" ; unset SILENTUPDATE ;;
+ *) _help
+ esac
fi
# MV_Themes Löschen!
if [ -z "$SILENTUPDATE" ] ; then
echo "-------------------------------"
echo "MV_Themen löschen? (J/n)"
+ [ -n "$DIRECTUPDATE" ] && echo "ACHTUNG: Dateien in /etc werden gelöscht!"
timedout_read 5 TASTE
if [ "$TASTE" = "n" -o "$TASTE" = "N" ] ; then
echo "Skript abgebrochen. Es wurde nichts gelöscht!"
@@ -48,11 +60,18 @@ if [ -z "$SILENTUPDATE" ] ; then
fi
fi
-rm -rf ../$ICONS/MV*
-rm -f ../$THEMES/flatPlus-MV*
-rm -f ../$DECORS/*MV*
-rm -f ../$INFO
-rm -f ../$HIST
+if [ -n "$DIRECTUPDATE" ] ; then # Löschen im Dateisystem (/etc)
+ rm -rf $ICONDIR/MV*
+ rm -f $THEMEDIR/flatPlus-MV*
+ rm -f $DECORDIR/*MV*
+else # Löschen im Source-Dir von skinflatPlus
+ rm -rf ../$ICONS/MV*
+ rm -f ../$THEMES/flatPlus-MV*
+ rm -f ../$DECORS/*MV*
+ rm -f ../$INFO
+ rm -f ../$HIST
+fi
+
echo "MV-Themen wurden entfernt."
# MV_Themes neu laden
@@ -65,19 +84,30 @@ fi
cd ..
# Download
+if [ -n "$DIRECTUPDATE" ] ; then
+ cd /tmp
+fi
wget https://dl.dropboxusercontent.com/u/1490505/VDR/skinflatplus/MV_Themes.tar.xz
tar -xJf MV_Themes.tar.xz # Entpacken
rm -rf MV_Themes.tar.xz # Archiv entfernen
+if [ -n "$DIRECTUPDATE" ] ; then
+ cp -f themes/flatPlus-MV* $THEMEDIR
+ cp -f decors/*MV* $DECORDIR
+ cp -rf icons/MV* $ICONDIR
+fi
+
echo "-------------------------------"
echo "MV-Themen wurden aktualisiert."
+[ -n "$DIRECTUPDATE" ] && exit
+
if [ -z "$SILENTUPDATE" ] ; then
echo "-------------------------------"
echo "MV_Themen installieren (make install)? (j/N)"
timedout_read 5 TASTE
if [ "$TASTE" = "j" -o "$TASTE" = "J" ] ; then
- cd ..
+ #cd ..
make install
echo "-------------------------------"
echo "MV-Themen wurden installiert."
diff --git a/displaychannel.c b/displaychannel.c
index 51df6014..3583e903 100644
--- a/displaychannel.c
+++ b/displaychannel.c
@@ -1,7 +1,7 @@
#include "displaychannel.h"
#include "flat.h"
-cFlatDisplayChannel::cFlatDisplayChannel(bool WithInfo) {
+cFlatDisplayChannel::cFlatDisplayChannel(bool WithInfo) : m_Receiver(NULL) {
if (firstDisplay) {
firstDisplay = false;
doOutput = false;
@@ -87,12 +87,27 @@ cFlatDisplayChannel::cFlatDisplayChannel(bool WithInfo) {
scrollers.SetScrollDelay( Config.ScrollerDelay );
scrollers.SetScrollType( Config.ScrollerType );
+ bitrateVideo = bitrateAudio = bitrateDolby = 0.0;
+ m_Receiver = NULL;
+ if( Config.ChannelBitrateShow ) {
+ const cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
+ eTrackType track = cDevice::PrimaryDevice()->GetCurrentAudioTrack();
+ if( channel ) {
+ m_Receiver = new cFemonReceiver(channel, IS_AUDIO_TRACK(track) ? int(track - ttAudioFirst) : 0, IS_DOLBY_TRACK(track) ? int(track - ttDolbyFirst) : 0);
+ cDevice::ActualDevice()->AttachReceiver(m_Receiver);
+ }
+ }
DecorBorderDraw(Config.decorBorderChannelSize, Config.decorBorderChannelSize+channelHeight - height,
channelWidth, heightTop + heightBottom + Config.decorProgressChannelSize+marginItem*2,
Config.decorBorderChannelSize, Config.decorBorderChannelType, Config.decorBorderChannelFg, Config.decorBorderChannelBg);
}
cFlatDisplayChannel::~cFlatDisplayChannel() {
+
+ if (m_Receiver != NULL ) {
+ m_Receiver->Deactivate();
+ delete m_Receiver;
+ }
if( !doOutput )
return;
if (osd) {
@@ -517,6 +532,71 @@ void cFlatDisplayChannel::SignalQualityDraw(void) {
}
+void cFlatDisplayChannel::BitrateDraw(void) {
+ int top = fontHeight*2 + fontSmlHeight*2 + marginItem;
+ top += max(fontSmlHeight, Config.decorProgressSignalSize) / 2 - fontSmlHeight / 2;
+ int left = marginItem * 2;
+ cFont *SignalFont = cFont::CreateFont(Setup.FontOsd, Config.decorProgressSignalSize);
+
+ if( Config.SignalQualityShow ) {
+ int signalWidth = channelWidth / 2;
+ int progressLeft = left + SignalFont->Width("STR") + SignalFont->Width(" ") + marginItem;
+ int progressWidth = signalWidth / 2 - progressLeft - marginItem;
+
+ left = progressLeft + progressWidth + marginItem * 4;
+ }
+
+ cString videoBit = cString::sprintf("%.2f", bitrateVideo / 1000000.0 );
+ cString audioBit = cString::sprintf("%.2f", bitrateAudio / 1000.0);
+
+ cString video = cString::sprintf("Video: %s Mbit/s", *videoBit );
+ cString audio = cString::sprintf("Audio: %s kbit/s", *audioBit );
+
+ chanInfoBottomPixmap->DrawText(cPoint(left, top), video, Theme.Color(clrChannelSignalFont), Theme.Color(clrChannelBg), SignalFont);
+ top += Config.decorProgressSignalSize + marginItem;
+ chanInfoBottomPixmap->DrawText(cPoint(left, top), audio, Theme.Color(clrChannelSignalFont), Theme.Color(clrChannelBg), SignalFont);
+}
+
+void cFlatDisplayChannel::ChannelSwitch(const cDevice * device, int channelNumber, bool liveView)
+{
+ if( !Config.ChannelBitrateShow )
+ return;
+
+ bitrateVideo = bitrateAudio = bitrateDolby = 0.0;
+ eTrackType track = cDevice::PrimaryDevice()->GetCurrentAudioTrack();
+ const cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
+
+ if (!liveView || !channelNumber || !channel || channel->Number() != channelNumber)
+ return;
+
+ if (m_Receiver) {
+ m_Receiver->Deactivate();
+ DELETENULL(m_Receiver);
+ }
+ if (channel) {
+ m_Receiver = new cFemonReceiver(channel, IS_AUDIO_TRACK(track) ? int(track - ttAudioFirst) : 0, IS_DOLBY_TRACK(track) ? int(track - ttDolbyFirst) : 0);
+ cDevice::ActualDevice()->AttachReceiver(m_Receiver);
+ }
+}
+
+void cFlatDisplayChannel::SetAudioTrack(int Index, const char * const *Tracks)
+{
+ if( !Config.ChannelBitrateShow )
+ return;
+
+ bitrateVideo = bitrateAudio = bitrateDolby = 0.0;
+ eTrackType track = cDevice::PrimaryDevice()->GetCurrentAudioTrack();
+ if (m_Receiver) {
+ m_Receiver->Deactivate();
+ DELETENULL(m_Receiver);
+ }
+ const cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
+ if (channel) {
+ m_Receiver = new cFemonReceiver(channel, IS_AUDIO_TRACK(track) ? int(track - ttAudioFirst) : 0, IS_DOLBY_TRACK(track) ? int(track - ttDolbyFirst) : 0);
+ cDevice::ActualDevice()->AttachReceiver(m_Receiver);
+ }
+}
+
void cFlatDisplayChannel::Flush(void) {
if( !doOutput )
return;
@@ -540,6 +620,16 @@ void cFlatDisplayChannel::Flush(void) {
ChannelIconsDraw(CurChannel, true);
}
}
+
+ if( Config.ChannelBitrateShow ) {
+
+ bitrateVideo = m_Receiver->VideoBitrate();
+ bitrateAudio = m_Receiver->AudioBitrate();
+ bitrateDolby = m_Receiver->AC3Bitrate();
+
+ BitrateDraw();
+ }
+
TopBarUpdate();
osd->Flush();
}
diff --git a/displaychannel.h b/displaychannel.h
index 20d83584..a83b0e5a 100644
--- a/displaychannel.h
+++ b/displaychannel.h
@@ -1,10 +1,12 @@
#pragma once
+#include <vdr/status.h>
#include "baserender.h"
#include "flat.h"
#include "services/scraper2vdr.h"
+#include "femonreceiver.h"
-class cFlatDisplayChannel : public cFlatBaseRender, public cSkinDisplayChannel {
+class cFlatDisplayChannel : public cFlatBaseRender, public cSkinDisplayChannel, public cStatus {
private:
bool doOutput;
const cEvent *present;
@@ -28,6 +30,10 @@ class cFlatDisplayChannel : public cFlatBaseRender, public cSkinDisplayChannel {
int LastSignalStrength, LastSignalQuality;
+ // femon
+ cFemonReceiver *m_Receiver;
+ double bitrateVideo, bitrateAudio, bitrateDolby;
+
// TVScraper
int TVSLeft, TVSTop, TVSWidth, TVSHeight;
@@ -39,6 +45,7 @@ class cFlatDisplayChannel : public cFlatBaseRender, public cSkinDisplayChannel {
bool isGroup;
void SignalQualityDraw(void);
+ void BitrateDraw(void);
void ChannelIconsDraw(const cChannel *Channel, bool Resolution);
public:
@@ -50,4 +57,7 @@ class cFlatDisplayChannel : public cFlatBaseRender, public cSkinDisplayChannel {
virtual void Flush(void);
void PreLoadImages(void);
+ protected:
+ virtual void ChannelSwitch(const cDevice *device, int channelNumber, bool liveView);
+ virtual void SetAudioTrack(int Index, const char * const *Tracks);
};
diff --git a/displayreplay.c b/displayreplay.c
index d5e383be..5d81ed9a 100644
--- a/displayreplay.c
+++ b/displayreplay.c
@@ -30,9 +30,13 @@ cFlatDisplayReplay::cFlatDisplayReplay(bool ModeOnly) {
labelJump->Fill(clrTransparent);
iconsPixmap->Fill(clrTransparent);
+ fontSecs = cFont::CreateFont(Setup.FontOsd, Setup.FontOsdSize * 0.6);
}
cFlatDisplayReplay::~cFlatDisplayReplay() {
+ if( fontSecs != NULL )
+ delete fontSecs;
+
osd->DestroyPixmap(labelPixmap);
osd->DestroyPixmap(labelJump);
osd->DestroyPixmap(iconsPixmap);
@@ -145,7 +149,22 @@ void cFlatDisplayReplay::UpdateInfo(void) {
cString cutted;
bool iscutted = false;
- labelPixmap->DrawText(cPoint(marginItem, 0), current, Theme.Color(clrReplayFont), Theme.Color(clrReplayBg), font, font->Width(current), fontHeight);
+ const char *foundDot = strchr(current, '.');
+ if( foundDot != NULL || !Config.RecordingSmallSecs )
+ labelPixmap->DrawText(cPoint(marginItem, 0), current, Theme.Color(clrReplayFont), Theme.Color(clrReplayBg), font, font->Width(current), fontHeight);
+ else {
+ std::string cur = *current;
+ size_t found = cur.find_last_of(':');
+ if( found != std::string::npos ) {
+ std::string hm = cur.substr(0, found);
+ std::string secs = cur.substr(found, cur.length() - found);
+
+ labelPixmap->DrawText(cPoint(marginItem, 0), hm.c_str(), Theme.Color(clrReplayFont), Theme.Color(clrReplayBg), font, font->Width(hm.c_str()), fontHeight);
+ labelPixmap->DrawText(cPoint(marginItem + font->Width(hm.c_str()), fontHeight - fontSecs->Height() - marginItem), secs.c_str(), Theme.Color(clrReplayFont), Theme.Color(clrReplayBg), fontSecs, fontSecs->Width(secs.c_str()), fontSecs->Height());
+ } else {
+ labelPixmap->DrawText(cPoint(marginItem, 0), current, Theme.Color(clrReplayFont), Theme.Color(clrReplayBg), font, font->Width(current), fontHeight);
+ }
+ }
if( recording ) {
cMarks marks;
@@ -221,18 +240,78 @@ void cFlatDisplayReplay::UpdateInfo(void) {
int imgWidth = 0;
if( imgRecCut )
imgWidth = imgRecCut->Width();
+
int right = osdWidth - Config.decorBorderReplaySize*2 - font->Width(total) - marginItem - imgWidth - font->Width(" ") - font->Width(cutted);
- labelPixmap->DrawText(cPoint(right - marginItem, 0), total, Theme.Color(clrReplayFont), Theme.Color(clrReplayBg), font, font->Width(total), fontHeight);
- right += font->Width(total);
- right += font->Width(" ");
+ if( Config.RecordingSmallSecs ) {
+ std::string tot = *total;
+ size_t found = tot.find_last_of(':');
+ if( found != std::string::npos ) {
+ std::string hm = tot.substr(0, found);
+ std::string secs = tot.substr(found, tot.length() - found);
+
+ std::string cutt = *cutted;
+ size_t found2 = cutt.find_last_of(':');
+ if( found2 != std::string::npos ) {
+ std::string hm2 = cutt.substr(0, found);
+ std::string secs2 = cutt.substr(found, cutt.length() - found);
+
+ right = osdWidth - Config.decorBorderReplaySize*2 - font->Width(hm.c_str()) - fontSecs->Width(secs.c_str()) - marginItem - imgWidth - font->Width(" ") - font->Width(hm2.c_str()) - fontSecs->Width(secs2.c_str());
+ } else
+ right = osdWidth - Config.decorBorderReplaySize*2 - font->Width(hm.c_str()) - fontSecs->Width(secs.c_str()) - marginItem - imgWidth - font->Width(" ") - font->Width(cutted);
+
+ labelPixmap->DrawText(cPoint(right - marginItem, 0), hm.c_str(), Theme.Color(clrReplayFont), Theme.Color(clrReplayBg), font, font->Width(hm.c_str()), fontHeight);
+ labelPixmap->DrawText(cPoint(right - marginItem + font->Width(hm.c_str()), fontHeight - fontSecs->Height() - marginItem), secs.c_str(), Theme.Color(clrReplayFont), Theme.Color(clrReplayBg), fontSecs, fontSecs->Width(secs.c_str()), fontSecs->Height());
+ right += font->Width(hm.c_str()) + fontSecs->Width(secs.c_str());
+ right += font->Width(" ");
+ } else {
+ labelPixmap->DrawText(cPoint(right - marginItem, 0), total, Theme.Color(clrReplayFont), Theme.Color(clrReplayBg), font, font->Width(total), fontHeight);
+ right += font->Width(total);
+ right += font->Width(" ");
+ }
+ } else {
+ labelPixmap->DrawText(cPoint(right - marginItem, 0), total, Theme.Color(clrReplayFont), Theme.Color(clrReplayBg), font, font->Width(total), fontHeight);
+ right += font->Width(total);
+ right += font->Width(" ");
+ }
+
if( imgRecCut ) {
iconsPixmap->DrawImage( cPoint(right, 0), *imgRecCut );
right += imgRecCut->Width() + marginItem*2;
}
- labelPixmap->DrawText(cPoint(right - marginItem, 0), cutted, Theme.Color(clrMenuItemExtraTextFont), Theme.Color(clrReplayBg), font, font->Width(cutted), fontHeight);
+
+ if( Config.RecordingSmallSecs ) {
+ std::string cutt = *cutted;
+ size_t found = cutt.find_last_of(':');
+ if( found != std::string::npos ) {
+ std::string hm = cutt.substr(0, found);
+ std::string secs = cutt.substr(found, cutt.length() - found);
+
+ labelPixmap->DrawText(cPoint(right - marginItem, 0), hm.c_str(), Theme.Color(clrMenuItemExtraTextFont), Theme.Color(clrReplayBg), font, font->Width(hm.c_str()), fontHeight);
+ labelPixmap->DrawText(cPoint(right - marginItem + font->Width(hm.c_str()), fontHeight - fontSecs->Height() - marginItem), secs.c_str(), Theme.Color(clrMenuItemExtraTextFont), Theme.Color(clrReplayBg), fontSecs, fontSecs->Width(secs.c_str()), fontSecs->Height());
+ } else {
+ labelPixmap->DrawText(cPoint(right - marginItem, 0), cutted, Theme.Color(clrMenuItemExtraTextFont), Theme.Color(clrReplayBg), font, font->Width(cutted), fontHeight);
+ }
+ } else {
+ labelPixmap->DrawText(cPoint(right - marginItem, 0), cutted, Theme.Color(clrMenuItemExtraTextFont), Theme.Color(clrReplayBg), font, font->Width(cutted), fontHeight);
+ }
} else {
int right = osdWidth - Config.decorBorderReplaySize*2 - font->Width(total);
- labelPixmap->DrawText(cPoint(right - marginItem, 0), total, Theme.Color(clrReplayFont), Theme.Color(clrReplayBg), font, font->Width(total), fontHeight);
+ if( Config.RecordingSmallSecs ) {
+ std::string tot = *total;
+ size_t found = tot.find_last_of(':');
+ if( found != std::string::npos ) {
+ std::string hm = tot.substr(0, found);
+ std::string secs = tot.substr(found, tot.length() - found);
+
+ right = osdWidth - Config.decorBorderReplaySize*2 - font->Width(hm.c_str()) - fontSecs->Width(secs.c_str());
+ labelPixmap->DrawText(cPoint(right - marginItem, 0), hm.c_str(), Theme.Color(clrReplayFont), Theme.Color(clrReplayBg), font, font->Width(hm.c_str()), fontHeight);
+ labelPixmap->DrawText(cPoint(right - marginItem + font->Width(hm.c_str()), fontHeight - fontSecs->Height() - marginItem), secs.c_str(), Theme.Color(clrReplayFont), Theme.Color(clrReplayBg), fontSecs, fontSecs->Width(secs.c_str()), fontSecs->Height());
+ } else {
+ labelPixmap->DrawText(cPoint(right - marginItem, 0), total, Theme.Color(clrReplayFont), Theme.Color(clrReplayBg), font, font->Width(total), fontHeight);
+ }
+ } else {
+ labelPixmap->DrawText(cPoint(right - marginItem, 0), total, Theme.Color(clrReplayFont), Theme.Color(clrReplayBg), font, font->Width(total), fontHeight);
+ }
}
}
diff --git a/displayreplay.h b/displayreplay.h
index a5ce2541..e9901809 100644
--- a/displayreplay.h
+++ b/displayreplay.h
@@ -5,18 +5,19 @@
class cFlatDisplayReplay : public cFlatBaseRender, public cSkinDisplayReplay {
private:
cString current, total;
-
+
int labelHeight;
cPixmap *labelPixmap;
cPixmap *labelJump;
cPixmap *iconsPixmap;
+ cFont *fontSecs;
const cRecording *recording;
int screenWidth, lastScreenWidth;
int screenHeight;
double screenAspect;
-
+
bool ProgressShown;
void UpdateInfo(void);
void ResolutionAspectDraw(void);
diff --git a/femonreceiver.c b/femonreceiver.c
new file mode 100644
index 00000000..9c7df27e
--- /dev/null
+++ b/femonreceiver.c
@@ -0,0 +1,185 @@
+/*
+ * Frontend Status Monitor plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ */
+
+#include <unistd.h>
+#include "femonreceiver.h"
+
+cFemonReceiver::cFemonReceiver(const cChannel *Channel, int ATrack, int DTrack)
+: cReceiver(Channel),
+ cThread("femon receiver"),
+ m_Mutex(),
+ m_Sleep(),
+ m_Active(false),
+ m_VideoBuffer(KILOBYTE(512), TS_SIZE, false, "Femon video"),
+ m_VideoType(Channel ? Channel->Vtype(): 0),
+ m_VideoPid(Channel ? Channel->Vpid() : 0), // Y
+ m_VideoPacketCount(0), // Y
+ m_AudioBuffer(KILOBYTE(256), TS_SIZE, false, "Femon audio"), // Y
+ m_AudioPid(Channel ? Channel->Apid(ATrack) : 0), // Y
+ m_AudioPacketCount(0), // Y
+ m_AC3Buffer(KILOBYTE(256), TS_SIZE, false, "Femon AC3"),
+ m_AC3Pid(Channel ? Channel->Dpid(DTrack) : 0), // Y
+ m_AC3PacketCount(0) // Y
+{
+ SetPids(NULL);
+ AddPid(m_VideoPid); // Y
+ AddPid(m_AudioPid); // Y
+ AddPid(m_AC3Pid); // Y
+
+ m_VideoBuffer.SetTimeouts(0, 100); // Y
+ m_AudioBuffer.SetTimeouts(0, 100); // Y
+ m_AC3Buffer.SetTimeouts(0, 100); // Y
+}
+
+cFemonReceiver::~cFemonReceiver(void)
+{
+ Deactivate();
+}
+
+void cFemonReceiver::Deactivate(void)
+{
+ Detach();
+ if (m_Active) {
+ m_Active = false;
+ m_Sleep.Signal();
+ if (Running())
+ Cancel(3);
+ }
+}
+
+void cFemonReceiver::Activate(bool On)
+{
+ if (On)
+ Start();
+ else
+ Deactivate();
+}
+
+void cFemonReceiver::Receive(uchar *Data, int Length)
+{
+ // TS packet length: TS_SIZE
+ if (Running() && (*Data == TS_SYNC_BYTE) && (Length == TS_SIZE)) {
+ int len, pid = TsPid(Data);
+ if (pid == m_VideoPid) {
+ ++m_VideoPacketCount;
+ len = m_VideoBuffer.Put(Data, Length);
+ if (len != Length) {
+ m_VideoBuffer.ReportOverflow(Length - len);
+ m_VideoBuffer.Clear();
+ }
+ }
+ else if (pid == m_AudioPid) {
+ ++m_AudioPacketCount;
+ len = m_AudioBuffer.Put(Data, Length);
+ if (len != Length) {
+ m_AudioBuffer.ReportOverflow(Length - len);
+ m_AudioBuffer.Clear();
+ }
+ }
+ else if (pid == m_AC3Pid) {
+ ++m_AC3PacketCount;
+ len = m_AC3Buffer.Put(Data, Length);
+ if (len != Length) {
+ m_AC3Buffer.ReportOverflow(Length - len);
+ m_AC3Buffer.Clear();
+ }
+ }
+ }
+}
+
+void cFemonReceiver::Action(void)
+{
+ cTimeMs calcPeriod(0);
+ m_Active = true;
+
+ while (Running() && m_Active) {
+ uint8_t *Data;
+ double timeout;
+ int Length;
+ bool processed = false;
+
+ // process available video data
+ while ((Data = m_VideoBuffer.Get(Length))) {
+ if (!m_Active || (Length < TS_SIZE))
+ break;
+ Length = TS_SIZE;
+ if (*Data != TS_SYNC_BYTE) {
+ for (int i = 1; i < Length; ++i) {
+ if (Data[i] == TS_SYNC_BYTE) {
+ Length = i;
+ break;
+ }
+ }
+ m_VideoBuffer.Del(Length);
+ continue;
+ }
+ processed = true;
+ if (TsPayloadStart(Data)) {
+ m_VideoAssembler.Reset();
+ }
+ m_VideoAssembler.PutTs(Data, Length);
+ m_VideoBuffer.Del(Length);
+ }
+
+ // process available audio data
+ while ((Data = m_AudioBuffer.Get(Length))) {
+ if (!m_Active || (Length < TS_SIZE))
+ break;
+ Length = TS_SIZE;
+ if (*Data != TS_SYNC_BYTE) {
+ for (int i = 1; i < Length; ++i) {
+ if (Data[i] == TS_SYNC_BYTE) {
+ Length = i;
+ break;
+ }
+ }
+ m_AudioBuffer.Del(Length);
+ continue;
+ }
+ processed = true;
+ m_AudioAssembler.PutTs(Data, Length);
+ m_AudioBuffer.Del(Length);
+ }
+
+ // process available dolby data
+ while ((Data = m_AC3Buffer.Get(Length))) {
+ if (!m_Active || (Length < TS_SIZE))
+ break;
+ Length = TS_SIZE;
+ if (*Data != TS_SYNC_BYTE) {
+ for (int i = 1; i < Length; ++i) {
+ if (Data[i] == TS_SYNC_BYTE) {
+ Length = i;
+ break;
+ }
+ }
+ m_AC3Buffer.Del(Length);
+ continue;
+ }
+ processed = true;
+ m_AC3Assembler.PutTs(Data, Length);
+ m_AC3Buffer.Del(Length);
+ }
+
+ // calculate bitrates
+ timeout = double(calcPeriod.Elapsed());
+ if (m_Active && (timeout >= (100.0 * Config.ChannelBitrateShowCalcInterval ))) {
+ // TS packet 188 bytes - 4 byte header; MPEG standard defines 1Mbit = 1000000bit
+ // PES headers should be compensated!
+ m_VideoBitrate = (1000.0 * 8.0 * 184.0 * m_VideoPacketCount) / timeout;
+ m_VideoPacketCount = 0;
+ m_AudioBitrate = (1000.0 * 8.0 * 184.0 * m_AudioPacketCount) / timeout;
+ m_AudioPacketCount = 0;
+ m_AC3Bitrate = (1000.0 * 8.0 * 184.0 * m_AC3PacketCount) / timeout;
+ m_AC3PacketCount = 0;
+ calcPeriod.Set(0);
+ }
+
+ if (!processed)
+ m_Sleep.Wait(10); // to avoid busy loop and reduce cpu load
+ }
+}
diff --git a/femonreceiver.h b/femonreceiver.h
new file mode 100644
index 00000000..75ea6f0b
--- /dev/null
+++ b/femonreceiver.h
@@ -0,0 +1,62 @@
+/*
+ * Frontend Status Monitor plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ */
+
+#ifndef __FEMONRECEIVER_H
+#define __FEMONRECEIVER_H
+
+#include <vdr/thread.h>
+#include <vdr/receiver.h>
+#include "baserender.h"
+
+class cFemonReceiver : public cFlatBaseRender, public cReceiver, public cThread {
+private:
+ cMutex m_Mutex;
+ cCondWait m_Sleep;
+ bool m_Active;
+
+
+ cRingBufferLinear m_VideoBuffer; // Y
+ cTsToPes m_VideoAssembler;
+ int m_VideoType;
+ int m_VideoPid; // Y
+ int m_VideoPacketCount; // Y
+ double m_VideoBitrate;
+
+ cRingBufferLinear m_AudioBuffer; // Y
+ cTsToPes m_AudioAssembler;
+ int m_AudioPid; // Y
+ int m_AudioPacketCount; // Y
+ double m_AudioBitrate;
+ bool m_AudioValid;
+
+ cRingBufferLinear m_AC3Buffer; // Y
+ cTsToPes m_AC3Assembler;
+ int m_AC3Pid; // Y
+ int m_AC3PacketCount; // Y
+ double m_AC3Bitrate; // Y
+ bool m_AC3Valid;
+
+protected:
+ virtual void Activate(bool On);
+ virtual void Receive(uchar *Data, int Length);
+ virtual void Action(void);
+
+public:
+ cFemonReceiver(const cChannel* Channel, int ATrack, int DTrack);
+ virtual ~cFemonReceiver();
+ void Deactivate(void);
+
+ double VideoBitrate(void) { cMutexLock MutexLock(&m_Mutex);
+ return m_VideoBitrate; }; // bit/s
+ double AudioBitrate(void) { cMutexLock MutexLock(&m_Mutex);
+ return m_AudioBitrate; }; // bit/s
+ double AC3Bitrate(void) { cMutexLock MutexLock(&m_Mutex);
+ return m_AC3Bitrate; }; // bit/s
+ };
+
+#endif //__FEMONRECEIVER_H
+
diff --git a/icons/MVBerry/changroup.png b/icons/MVBerry/changroup.png
index d3ebdf76..72744ee2 100644
--- a/icons/MVBerry/changroup.png
+++ b/icons/MVBerry/changroup.png
Binary files differ
diff --git a/icons/MVBerry/forward_sel.png b/icons/MVBerry/forward_sel.png
index 22478206..5f362271 100644
--- a/icons/MVBerry/forward_sel.png
+++ b/icons/MVBerry/forward_sel.png
Binary files differ
diff --git a/icons/MVBerry/pause_sel.png b/icons/MVBerry/pause_sel.png
index 7522b06d..2b5dce67 100644
--- a/icons/MVBerry/pause_sel.png
+++ b/icons/MVBerry/pause_sel.png
Binary files differ
diff --git a/icons/MVBerry/play_sel.png b/icons/MVBerry/play_sel.png
index dee79d0a..17298aa4 100644
--- a/icons/MVBerry/play_sel.png
+++ b/icons/MVBerry/play_sel.png
Binary files differ
diff --git a/icons/MVBerry/prev_sel.png b/icons/MVBerry/prev_sel.png
index eac49e1f..5bf19312 100644
--- a/icons/MVBerry/prev_sel.png
+++ b/icons/MVBerry/prev_sel.png
Binary files differ
diff --git a/icons/MVBerry/recording_cutted.png b/icons/MVBerry/recording_cutted.png
index bbca7708..48a86a6d 100644
--- a/icons/MVBerry/recording_cutted.png
+++ b/icons/MVBerry/recording_cutted.png
Binary files differ
diff --git a/icons/MVBerry/recording_cutted_extra.png b/icons/MVBerry/recording_cutted_extra.png
index 11bcbac9..7b57f470 100644
--- a/icons/MVBerry/recording_cutted_extra.png
+++ b/icons/MVBerry/recording_cutted_extra.png
Binary files differ
diff --git a/icons/MVBerry/recording_new.png b/icons/MVBerry/recording_new.png
index c4d9cc47..6098d666 100644
--- a/icons/MVBerry/recording_new.png
+++ b/icons/MVBerry/recording_new.png
Binary files differ
diff --git a/icons/MVBerry/rewind_sel.png b/icons/MVBerry/rewind_sel.png
index 848508d8..a5f8192a 100644
--- a/icons/MVBerry/rewind_sel.png
+++ b/icons/MVBerry/rewind_sel.png
Binary files differ
diff --git a/icons/MVBerry/skip_sel.png b/icons/MVBerry/skip_sel.png
index 70c552bc..67f2f4b2 100644
--- a/icons/MVBerry/skip_sel.png
+++ b/icons/MVBerry/skip_sel.png
Binary files differ
diff --git a/icons/MVBerry/timer_full.png b/icons/MVBerry/timer_full.png
index 5a98d142..cec300c1 100644
--- a/icons/MVBerry/timer_full.png
+++ b/icons/MVBerry/timer_full.png
Binary files differ
diff --git a/icons/MVBerry/timer_partial.png b/icons/MVBerry/timer_partial.png
index 88e75e2c..3bbb19b9 100644
--- a/icons/MVBerry/timer_partial.png
+++ b/icons/MVBerry/timer_partial.png
Binary files differ
diff --git a/icons/MVBerry/vps.png b/icons/MVBerry/vps.png
index 7c5bb885..5d8f94c9 100644
--- a/icons/MVBerry/vps.png
+++ b/icons/MVBerry/vps.png
Binary files differ
diff --git a/icons/MVBlood/changroup.png b/icons/MVBlood/changroup.png
index 5c86fe11..2c5fc3c4 100644
--- a/icons/MVBlood/changroup.png
+++ b/icons/MVBlood/changroup.png
Binary files differ
diff --git a/icons/MVBlood/forward_sel.png b/icons/MVBlood/forward_sel.png
index 2446b090..4d6b58e3 100644
--- a/icons/MVBlood/forward_sel.png
+++ b/icons/MVBlood/forward_sel.png
Binary files differ
diff --git a/icons/MVBlood/pause_sel.png b/icons/MVBlood/pause_sel.png
index 9ce152ec..999ce2e8 100644
--- a/icons/MVBlood/pause_sel.png
+++ b/icons/MVBlood/pause_sel.png
Binary files differ
diff --git a/icons/MVBlood/play_sel.png b/icons/MVBlood/play_sel.png
index b09d0ec3..bf8eb5c9 100644
--- a/icons/MVBlood/play_sel.png
+++ b/icons/MVBlood/play_sel.png
Binary files differ
diff --git a/icons/MVBlood/prev_sel.png b/icons/MVBlood/prev_sel.png
index a1144d29..7936896f 100644
--- a/icons/MVBlood/prev_sel.png
+++ b/icons/MVBlood/prev_sel.png
Binary files differ
diff --git a/icons/MVBlood/recording_cutted.png b/icons/MVBlood/recording_cutted.png
index 4eb56b5b..60e2fcfa 100644
--- a/icons/MVBlood/recording_cutted.png
+++ b/icons/MVBlood/recording_cutted.png
Binary files differ
diff --git a/icons/MVBlood/recording_cutted_extra.png b/icons/MVBlood/recording_cutted_extra.png
index aed9129e..5e210a9c 100644
--- a/icons/MVBlood/recording_cutted_extra.png
+++ b/icons/MVBlood/recording_cutted_extra.png
Binary files differ
diff --git a/icons/MVBlood/recording_new.png b/icons/MVBlood/recording_new.png
index fbf22568..af0e6c02 100644
--- a/icons/MVBlood/recording_new.png
+++ b/icons/MVBlood/recording_new.png
Binary files differ
diff --git a/icons/MVBlood/rewind_sel.png b/icons/MVBlood/rewind_sel.png
index 0fc91684..d2eea10d 100644
--- a/icons/MVBlood/rewind_sel.png
+++ b/icons/MVBlood/rewind_sel.png
Binary files differ
diff --git a/icons/MVBlood/skip_sel.png b/icons/MVBlood/skip_sel.png
index 6ac1f206..2ae798d1 100644
--- a/icons/MVBlood/skip_sel.png
+++ b/icons/MVBlood/skip_sel.png
Binary files differ
diff --git a/icons/MVBlood/timer_full.png b/icons/MVBlood/timer_full.png
index c85e7f96..704da0b3 100644
--- a/icons/MVBlood/timer_full.png
+++ b/icons/MVBlood/timer_full.png
Binary files differ
diff --git a/icons/MVBlood/timer_partial.png b/icons/MVBlood/timer_partial.png
index 50e3a1ba..5554cf94 100644
--- a/icons/MVBlood/timer_partial.png
+++ b/icons/MVBlood/timer_partial.png
Binary files differ
diff --git a/icons/MVBlood/vps.png b/icons/MVBlood/vps.png
index 3397438a..7479eaca 100644
--- a/icons/MVBlood/vps.png
+++ b/icons/MVBlood/vps.png
Binary files differ
diff --git a/icons/MVBlue/changroup.png b/icons/MVBlue/changroup.png
index fc0f77dd..43a6215f 100644
--- a/icons/MVBlue/changroup.png
+++ b/icons/MVBlue/changroup.png
Binary files differ
diff --git a/icons/MVBlue/forward_sel.png b/icons/MVBlue/forward_sel.png
index d20dd69f..bc1457ab 100644
--- a/icons/MVBlue/forward_sel.png
+++ b/icons/MVBlue/forward_sel.png
Binary files differ
diff --git a/icons/MVBlue/pause_sel.png b/icons/MVBlue/pause_sel.png
index a2447d68..46bfe22c 100644
--- a/icons/MVBlue/pause_sel.png
+++ b/icons/MVBlue/pause_sel.png
Binary files differ
diff --git a/icons/MVBlue/play_sel.png b/icons/MVBlue/play_sel.png
index 480ffea6..21a9de5a 100644
--- a/icons/MVBlue/play_sel.png
+++ b/icons/MVBlue/play_sel.png
Binary files differ
diff --git a/icons/MVBlue/prev_sel.png b/icons/MVBlue/prev_sel.png
index 275b3272..fa3f6001 100644
--- a/icons/MVBlue/prev_sel.png
+++ b/icons/MVBlue/prev_sel.png
Binary files differ
diff --git a/icons/MVBlue/recording_cutted.png b/icons/MVBlue/recording_cutted.png
index 2a75e750..6f707ce0 100644
--- a/icons/MVBlue/recording_cutted.png
+++ b/icons/MVBlue/recording_cutted.png
Binary files differ
diff --git a/icons/MVBlue/recording_cutted_extra.png b/icons/MVBlue/recording_cutted_extra.png
index 39cf1aa9..6dfb020c 100644
--- a/icons/MVBlue/recording_cutted_extra.png
+++ b/icons/MVBlue/recording_cutted_extra.png
Binary files differ
diff --git a/icons/MVBlue/recording_new.png b/icons/MVBlue/recording_new.png
index 3b00e402..d40da363 100644
--- a/icons/MVBlue/recording_new.png
+++ b/icons/MVBlue/recording_new.png
Binary files differ
diff --git a/icons/MVBlue/rewind_sel.png b/icons/MVBlue/rewind_sel.png
index cfe240ca..4056c0c4 100644
--- a/icons/MVBlue/rewind_sel.png
+++ b/icons/MVBlue/rewind_sel.png
Binary files differ
diff --git a/icons/MVBlue/skip_sel.png b/icons/MVBlue/skip_sel.png
index 4bd4506d..6b03ed1d 100644
--- a/icons/MVBlue/skip_sel.png
+++ b/icons/MVBlue/skip_sel.png
Binary files differ
diff --git a/icons/MVBlue/timer_full.png b/icons/MVBlue/timer_full.png
index e5b54e24..e22ccf89 100644
--- a/icons/MVBlue/timer_full.png
+++ b/icons/MVBlue/timer_full.png
Binary files differ
diff --git a/icons/MVBlue/timer_partial.png b/icons/MVBlue/timer_partial.png
index ccc80563..4c906f07 100644
--- a/icons/MVBlue/timer_partial.png
+++ b/icons/MVBlue/timer_partial.png
Binary files differ
diff --git a/icons/MVBlue/vps.png b/icons/MVBlue/vps.png
index 9195f58d..680f66a4 100644
--- a/icons/MVBlue/vps.png
+++ b/icons/MVBlue/vps.png
Binary files differ
diff --git a/icons/MVCappuchino/changroup.png b/icons/MVCappuchino/changroup.png
index 7f5a436b..07dd924d 100644
--- a/icons/MVCappuchino/changroup.png
+++ b/icons/MVCappuchino/changroup.png
Binary files differ
diff --git a/icons/MVCappuchino/forward_sel.png b/icons/MVCappuchino/forward_sel.png
index 18c16b0d..3a6c87fe 100644
--- a/icons/MVCappuchino/forward_sel.png
+++ b/icons/MVCappuchino/forward_sel.png
Binary files differ
diff --git a/icons/MVCappuchino/pause_sel.png b/icons/MVCappuchino/pause_sel.png
index ae1a2c54..9d8aeee3 100644
--- a/icons/MVCappuchino/pause_sel.png
+++ b/icons/MVCappuchino/pause_sel.png
Binary files differ
diff --git a/icons/MVCappuchino/play_sel.png b/icons/MVCappuchino/play_sel.png
index 7a70883f..4210d976 100644
--- a/icons/MVCappuchino/play_sel.png
+++ b/icons/MVCappuchino/play_sel.png
Binary files differ
diff --git a/icons/MVCappuchino/prev_sel.png b/icons/MVCappuchino/prev_sel.png
index 8abca87e..32b72758 100644
--- a/icons/MVCappuchino/prev_sel.png
+++ b/icons/MVCappuchino/prev_sel.png
Binary files differ
diff --git a/icons/MVCappuchino/recording_cutted.png b/icons/MVCappuchino/recording_cutted.png
index c0805c42..4f56381b 100644
--- a/icons/MVCappuchino/recording_cutted.png
+++ b/icons/MVCappuchino/recording_cutted.png
Binary files differ
diff --git a/icons/MVCappuchino/recording_cutted_extra.png b/icons/MVCappuchino/recording_cutted_extra.png
index fd61273e..3cb91d95 100644
--- a/icons/MVCappuchino/recording_cutted_extra.png
+++ b/icons/MVCappuchino/recording_cutted_extra.png
Binary files differ
diff --git a/icons/MVCappuchino/recording_new.png b/icons/MVCappuchino/recording_new.png
index 58fcb038..801bc4c3 100644
--- a/icons/MVCappuchino/recording_new.png
+++ b/icons/MVCappuchino/recording_new.png
Binary files differ
diff --git a/icons/MVCappuchino/rewind_sel.png b/icons/MVCappuchino/rewind_sel.png
index bf42e1dc..57a2842b 100644
--- a/icons/MVCappuchino/rewind_sel.png
+++ b/icons/MVCappuchino/rewind_sel.png
Binary files differ
diff --git a/icons/MVCappuchino/skip_sel.png b/icons/MVCappuchino/skip_sel.png
index dfc91b77..bd2236f9 100644
--- a/icons/MVCappuchino/skip_sel.png
+++ b/icons/MVCappuchino/skip_sel.png
Binary files differ
diff --git a/icons/MVCappuchino/timer_full.png b/icons/MVCappuchino/timer_full.png
index 3734d079..f4e200b9 100644
--- a/icons/MVCappuchino/timer_full.png
+++ b/icons/MVCappuchino/timer_full.png
Binary files differ
diff --git a/icons/MVCappuchino/timer_partial.png b/icons/MVCappuchino/timer_partial.png
index b3323df8..b52d4135 100644
--- a/icons/MVCappuchino/timer_partial.png
+++ b/icons/MVCappuchino/timer_partial.png
Binary files differ
diff --git a/icons/MVCappuchino/vps.png b/icons/MVCappuchino/vps.png
index 338f1d00..7564e464 100644
--- a/icons/MVCappuchino/vps.png
+++ b/icons/MVCappuchino/vps.png
Binary files differ
diff --git a/icons/MVChocolate/changroup.png b/icons/MVChocolate/changroup.png
index 4c42a153..17b69ed6 100644
--- a/icons/MVChocolate/changroup.png
+++ b/icons/MVChocolate/changroup.png
Binary files differ
diff --git a/icons/MVChocolate/forward_sel.png b/icons/MVChocolate/forward_sel.png
index 3a00a404..8cb1fe22 100644
--- a/icons/MVChocolate/forward_sel.png
+++ b/icons/MVChocolate/forward_sel.png
Binary files differ
diff --git a/icons/MVChocolate/pause_sel.png b/icons/MVChocolate/pause_sel.png
index 19a2570f..82d2a478 100644
--- a/icons/MVChocolate/pause_sel.png
+++ b/icons/MVChocolate/pause_sel.png
Binary files differ
diff --git a/icons/MVChocolate/play_sel.png b/icons/MVChocolate/play_sel.png
index 027275a6..56374825 100644
--- a/icons/MVChocolate/play_sel.png
+++ b/icons/MVChocolate/play_sel.png
Binary files differ
diff --git a/icons/MVChocolate/prev_sel.png b/icons/MVChocolate/prev_sel.png
index 00af9f1e..75d56c3c 100644
--- a/icons/MVChocolate/prev_sel.png
+++ b/icons/MVChocolate/prev_sel.png
Binary files differ
diff --git a/icons/MVChocolate/recording_cutted.png b/icons/MVChocolate/recording_cutted.png
index 19c96d19..f41d0b1b 100644
--- a/icons/MVChocolate/recording_cutted.png
+++ b/icons/MVChocolate/recording_cutted.png
Binary files differ
diff --git a/icons/MVChocolate/recording_cutted_extra.png b/icons/MVChocolate/recording_cutted_extra.png
index fe49e413..06e5f514 100644
--- a/icons/MVChocolate/recording_cutted_extra.png
+++ b/icons/MVChocolate/recording_cutted_extra.png
Binary files differ
diff --git a/icons/MVChocolate/recording_new.png b/icons/MVChocolate/recording_new.png
index 6a05f88a..9156b4de 100644
--- a/icons/MVChocolate/recording_new.png
+++ b/icons/MVChocolate/recording_new.png
Binary files differ
diff --git a/icons/MVChocolate/rewind_sel.png b/icons/MVChocolate/rewind_sel.png
index d0e34014..55307dfd 100644
--- a/icons/MVChocolate/rewind_sel.png
+++ b/icons/MVChocolate/rewind_sel.png
Binary files differ
diff --git a/icons/MVChocolate/skip_sel.png b/icons/MVChocolate/skip_sel.png
index bc4cb269..59e8780c 100644
--- a/icons/MVChocolate/skip_sel.png
+++ b/icons/MVChocolate/skip_sel.png
Binary files differ
diff --git a/icons/MVChocolate/timer_full.png b/icons/MVChocolate/timer_full.png
index ad1e9be2..f83ee033 100644
--- a/icons/MVChocolate/timer_full.png
+++ b/icons/MVChocolate/timer_full.png
Binary files differ
diff --git a/icons/MVChocolate/timer_partial.png b/icons/MVChocolate/timer_partial.png
index acd36bbc..582fdf2d 100644
--- a/icons/MVChocolate/timer_partial.png
+++ b/icons/MVChocolate/timer_partial.png
Binary files differ
diff --git a/icons/MVChocolate/vps.png b/icons/MVChocolate/vps.png
index 6e829917..29cff0fd 100644
--- a/icons/MVChocolate/vps.png
+++ b/icons/MVChocolate/vps.png
Binary files differ
diff --git a/icons/MVCyan/changroup.png b/icons/MVCyan/changroup.png
index acb62a00..21381378 100644
--- a/icons/MVCyan/changroup.png
+++ b/icons/MVCyan/changroup.png
Binary files differ
diff --git a/icons/MVCyan/forward_sel.png b/icons/MVCyan/forward_sel.png
index e132bac1..b4786f90 100644
--- a/icons/MVCyan/forward_sel.png
+++ b/icons/MVCyan/forward_sel.png
Binary files differ
diff --git a/icons/MVCyan/pause_sel.png b/icons/MVCyan/pause_sel.png
index 9cd9d316..a60128a5 100644
--- a/icons/MVCyan/pause_sel.png
+++ b/icons/MVCyan/pause_sel.png
Binary files differ
diff --git a/icons/MVCyan/play_sel.png b/icons/MVCyan/play_sel.png
index 6fbffa1d..8e4e3418 100644
--- a/icons/MVCyan/play_sel.png
+++ b/icons/MVCyan/play_sel.png
Binary files differ
diff --git a/icons/MVCyan/prev_sel.png b/icons/MVCyan/prev_sel.png
index 068d6a47..3b291f77 100644
--- a/icons/MVCyan/prev_sel.png
+++ b/icons/MVCyan/prev_sel.png
Binary files differ
diff --git a/icons/MVCyan/recording_cutted.png b/icons/MVCyan/recording_cutted.png
index d95fdf4a..ab1d1f4d 100644
--- a/icons/MVCyan/recording_cutted.png
+++ b/icons/MVCyan/recording_cutted.png
Binary files differ
diff --git a/icons/MVCyan/recording_cutted_extra.png b/icons/MVCyan/recording_cutted_extra.png
index 20f24462..ec98c30c 100644
--- a/icons/MVCyan/recording_cutted_extra.png
+++ b/icons/MVCyan/recording_cutted_extra.png
Binary files differ
diff --git a/icons/MVCyan/recording_new.png b/icons/MVCyan/recording_new.png
index 3f6b8259..5eb713af 100644
--- a/icons/MVCyan/recording_new.png
+++ b/icons/MVCyan/recording_new.png
Binary files differ
diff --git a/icons/MVCyan/rewind_sel.png b/icons/MVCyan/rewind_sel.png
index ee53e79b..73d3655f 100644
--- a/icons/MVCyan/rewind_sel.png
+++ b/icons/MVCyan/rewind_sel.png
Binary files differ
diff --git a/icons/MVCyan/skip_sel.png b/icons/MVCyan/skip_sel.png
index 67f7330d..46e81e6c 100644
--- a/icons/MVCyan/skip_sel.png
+++ b/icons/MVCyan/skip_sel.png
Binary files differ
diff --git a/icons/MVCyan/timer_full.png b/icons/MVCyan/timer_full.png
index 945f5d9d..49341547 100644
--- a/icons/MVCyan/timer_full.png
+++ b/icons/MVCyan/timer_full.png
Binary files differ
diff --git a/icons/MVCyan/timer_partial.png b/icons/MVCyan/timer_partial.png
index 5a71e24d..5950f34f 100644
--- a/icons/MVCyan/timer_partial.png
+++ b/icons/MVCyan/timer_partial.png
Binary files differ
diff --git a/icons/MVCyan/vps.png b/icons/MVCyan/vps.png
index f96701ad..15f96e3c 100644
--- a/icons/MVCyan/vps.png
+++ b/icons/MVCyan/vps.png
Binary files differ
diff --git a/icons/MVDeepBlue/changroup.png b/icons/MVDeepBlue/changroup.png
index bc958be0..6f358a52 100644
--- a/icons/MVDeepBlue/changroup.png
+++ b/icons/MVDeepBlue/changroup.png
Binary files differ
diff --git a/icons/MVDeepBlue/forward_sel.png b/icons/MVDeepBlue/forward_sel.png
index d1154145..03015a68 100644
--- a/icons/MVDeepBlue/forward_sel.png
+++ b/icons/MVDeepBlue/forward_sel.png
Binary files differ
diff --git a/icons/MVDeepBlue/pause_sel.png b/icons/MVDeepBlue/pause_sel.png
index 76ab6fc8..8ddda336 100644
--- a/icons/MVDeepBlue/pause_sel.png
+++ b/icons/MVDeepBlue/pause_sel.png
Binary files differ
diff --git a/icons/MVDeepBlue/play_sel.png b/icons/MVDeepBlue/play_sel.png
index 889a2aac..31539924 100644
--- a/icons/MVDeepBlue/play_sel.png
+++ b/icons/MVDeepBlue/play_sel.png
Binary files differ
diff --git a/icons/MVDeepBlue/prev_sel.png b/icons/MVDeepBlue/prev_sel.png
index 7e906e84..286fa795 100644
--- a/icons/MVDeepBlue/prev_sel.png
+++ b/icons/MVDeepBlue/prev_sel.png
Binary files differ
diff --git a/icons/MVDeepBlue/recording_cutted.png b/icons/MVDeepBlue/recording_cutted.png
index bd7b7eea..ce878f5f 100644
--- a/icons/MVDeepBlue/recording_cutted.png
+++ b/icons/MVDeepBlue/recording_cutted.png
Binary files differ
diff --git a/icons/MVDeepBlue/recording_cutted_extra.png b/icons/MVDeepBlue/recording_cutted_extra.png
index 1afaddcd..cce2f97d 100644
--- a/icons/MVDeepBlue/recording_cutted_extra.png
+++ b/icons/MVDeepBlue/recording_cutted_extra.png
Binary files differ
diff --git a/icons/MVDeepBlue/recording_new.png b/icons/MVDeepBlue/recording_new.png
index e8122f3f..149c5f03 100644
--- a/icons/MVDeepBlue/recording_new.png
+++ b/icons/MVDeepBlue/recording_new.png
Binary files differ
diff --git a/icons/MVDeepBlue/rewind_sel.png b/icons/MVDeepBlue/rewind_sel.png
index 55b0946e..5c30732a 100644
--- a/icons/MVDeepBlue/rewind_sel.png
+++ b/icons/MVDeepBlue/rewind_sel.png
Binary files differ
diff --git a/icons/MVDeepBlue/skip_sel.png b/icons/MVDeepBlue/skip_sel.png
index 5194bf40..75a9acd1 100644
--- a/icons/MVDeepBlue/skip_sel.png
+++ b/icons/MVDeepBlue/skip_sel.png
Binary files differ
diff --git a/icons/MVDeepBlue/timer_full.png b/icons/MVDeepBlue/timer_full.png
index dc8e97fb..5041f8ba 100644
--- a/icons/MVDeepBlue/timer_full.png
+++ b/icons/MVDeepBlue/timer_full.png
Binary files differ
diff --git a/icons/MVDeepBlue/timer_partial.png b/icons/MVDeepBlue/timer_partial.png
index 98c8f99a..fbf7d958 100644
--- a/icons/MVDeepBlue/timer_partial.png
+++ b/icons/MVDeepBlue/timer_partial.png
Binary files differ
diff --git a/icons/MVDeepBlue/vps.png b/icons/MVDeepBlue/vps.png
index 21d05909..aec7d7e9 100644
--- a/icons/MVDeepBlue/vps.png
+++ b/icons/MVDeepBlue/vps.png
Binary files differ
diff --git a/icons/MVFog/changroup.png b/icons/MVFog/changroup.png
index 16468895..54d8c5c2 100644
--- a/icons/MVFog/changroup.png
+++ b/icons/MVFog/changroup.png
Binary files differ
diff --git a/icons/MVFog/forward_sel.png b/icons/MVFog/forward_sel.png
index ca9fbc7f..0c84a751 100644
--- a/icons/MVFog/forward_sel.png
+++ b/icons/MVFog/forward_sel.png
Binary files differ
diff --git a/icons/MVFog/pause_sel.png b/icons/MVFog/pause_sel.png
index 5c1ef6db..346c8405 100644
--- a/icons/MVFog/pause_sel.png
+++ b/icons/MVFog/pause_sel.png
Binary files differ
diff --git a/icons/MVFog/play_sel.png b/icons/MVFog/play_sel.png
index 30287757..e5fe36d6 100644
--- a/icons/MVFog/play_sel.png
+++ b/icons/MVFog/play_sel.png
Binary files differ
diff --git a/icons/MVFog/prev_sel.png b/icons/MVFog/prev_sel.png
index 7d1dd653..83845f90 100644
--- a/icons/MVFog/prev_sel.png
+++ b/icons/MVFog/prev_sel.png
Binary files differ
diff --git a/icons/MVFog/recording_cutted.png b/icons/MVFog/recording_cutted.png
index 19a1a856..8cbf5e2d 100644
--- a/icons/MVFog/recording_cutted.png
+++ b/icons/MVFog/recording_cutted.png
Binary files differ
diff --git a/icons/MVFog/recording_cutted_extra.png b/icons/MVFog/recording_cutted_extra.png
index dd5efc81..65ff8c95 100644
--- a/icons/MVFog/recording_cutted_extra.png
+++ b/icons/MVFog/recording_cutted_extra.png
Binary files differ
diff --git a/icons/MVFog/recording_new.png b/icons/MVFog/recording_new.png
index 0407aba3..1ee3fb0b 100644
--- a/icons/MVFog/recording_new.png
+++ b/icons/MVFog/recording_new.png
Binary files differ
diff --git a/icons/MVFog/rewind_sel.png b/icons/MVFog/rewind_sel.png
index ebf766e9..89b810bd 100644
--- a/icons/MVFog/rewind_sel.png
+++ b/icons/MVFog/rewind_sel.png
Binary files differ
diff --git a/icons/MVFog/skip_sel.png b/icons/MVFog/skip_sel.png
index 15a95105..5726fd46 100644
--- a/icons/MVFog/skip_sel.png
+++ b/icons/MVFog/skip_sel.png
Binary files differ
diff --git a/icons/MVFog/timer_full.png b/icons/MVFog/timer_full.png
index 28f26d17..4c8710d1 100644
--- a/icons/MVFog/timer_full.png
+++ b/icons/MVFog/timer_full.png
Binary files differ
diff --git a/icons/MVFog/timer_partial.png b/icons/MVFog/timer_partial.png
index dd1fd1c4..8105052a 100644
--- a/icons/MVFog/timer_partial.png
+++ b/icons/MVFog/timer_partial.png
Binary files differ
diff --git a/icons/MVFog/vps.png b/icons/MVFog/vps.png
index f1c4b1ce..e99c1590 100644
--- a/icons/MVFog/vps.png
+++ b/icons/MVFog/vps.png
Binary files differ
diff --git a/icons/MVGrapefruit/changroup.png b/icons/MVGrapefruit/changroup.png
index fa9e017b..3644ce30 100644
--- a/icons/MVGrapefruit/changroup.png
+++ b/icons/MVGrapefruit/changroup.png
Binary files differ
diff --git a/icons/MVGrapefruit/forward_sel.png b/icons/MVGrapefruit/forward_sel.png
index cc574c1f..badde568 100644
--- a/icons/MVGrapefruit/forward_sel.png
+++ b/icons/MVGrapefruit/forward_sel.png
Binary files differ
diff --git a/icons/MVGrapefruit/pause_sel.png b/icons/MVGrapefruit/pause_sel.png
index ef93fdaf..e7fad513 100644
--- a/icons/MVGrapefruit/pause_sel.png
+++ b/icons/MVGrapefruit/pause_sel.png
Binary files differ
diff --git a/icons/MVGrapefruit/play_sel.png b/icons/MVGrapefruit/play_sel.png
index f24022a7..a4708a49 100644
--- a/icons/MVGrapefruit/play_sel.png
+++ b/icons/MVGrapefruit/play_sel.png
Binary files differ
diff --git a/icons/MVGrapefruit/prev_sel.png b/icons/MVGrapefruit/prev_sel.png
index 4213dc20..997dbbd2 100644
--- a/icons/MVGrapefruit/prev_sel.png
+++ b/icons/MVGrapefruit/prev_sel.png
Binary files differ
diff --git a/icons/MVGrapefruit/recording_cutted.png b/icons/MVGrapefruit/recording_cutted.png
index ddd6647b..c0d608ea 100644
--- a/icons/MVGrapefruit/recording_cutted.png
+++ b/icons/MVGrapefruit/recording_cutted.png
Binary files differ
diff --git a/icons/MVGrapefruit/recording_cutted_extra.png b/icons/MVGrapefruit/recording_cutted_extra.png
index a3eb74fc..4545a4d1 100644
--- a/icons/MVGrapefruit/recording_cutted_extra.png
+++ b/icons/MVGrapefruit/recording_cutted_extra.png
Binary files differ
diff --git a/icons/MVGrapefruit/recording_new.png b/icons/MVGrapefruit/recording_new.png
index b9f95066..0651b2a5 100644
--- a/icons/MVGrapefruit/recording_new.png
+++ b/icons/MVGrapefruit/recording_new.png
Binary files differ
diff --git a/icons/MVGrapefruit/rewind_sel.png b/icons/MVGrapefruit/rewind_sel.png
index 7f8419cc..92ccc937 100644
--- a/icons/MVGrapefruit/rewind_sel.png
+++ b/icons/MVGrapefruit/rewind_sel.png
Binary files differ
diff --git a/icons/MVGrapefruit/skip_sel.png b/icons/MVGrapefruit/skip_sel.png
index 89adc035..a12f4fde 100644
--- a/icons/MVGrapefruit/skip_sel.png
+++ b/icons/MVGrapefruit/skip_sel.png
Binary files differ
diff --git a/icons/MVGrapefruit/timer_full.png b/icons/MVGrapefruit/timer_full.png
index 7043bd97..a4d41457 100644
--- a/icons/MVGrapefruit/timer_full.png
+++ b/icons/MVGrapefruit/timer_full.png
Binary files differ
diff --git a/icons/MVGrapefruit/timer_partial.png b/icons/MVGrapefruit/timer_partial.png
index b6d1ca25..07a003f8 100644
--- a/icons/MVGrapefruit/timer_partial.png
+++ b/icons/MVGrapefruit/timer_partial.png
Binary files differ
diff --git a/icons/MVGrapefruit/vps.png b/icons/MVGrapefruit/vps.png
index 812e9ee3..f64f217d 100644
--- a/icons/MVGrapefruit/vps.png
+++ b/icons/MVGrapefruit/vps.png
Binary files differ
diff --git a/icons/MVGreen/changroup.png b/icons/MVGreen/changroup.png
index 5bb556e6..250aac89 100644
--- a/icons/MVGreen/changroup.png
+++ b/icons/MVGreen/changroup.png
Binary files differ
diff --git a/icons/MVGreen/forward_sel.png b/icons/MVGreen/forward_sel.png
index 2fb001c5..be199b7e 100644
--- a/icons/MVGreen/forward_sel.png
+++ b/icons/MVGreen/forward_sel.png
Binary files differ
diff --git a/icons/MVGreen/pause_sel.png b/icons/MVGreen/pause_sel.png
index 0d219a06..b38493b2 100644
--- a/icons/MVGreen/pause_sel.png
+++ b/icons/MVGreen/pause_sel.png
Binary files differ
diff --git a/icons/MVGreen/play_sel.png b/icons/MVGreen/play_sel.png
index 55ba4d52..3db30755 100644
--- a/icons/MVGreen/play_sel.png
+++ b/icons/MVGreen/play_sel.png
Binary files differ
diff --git a/icons/MVGreen/prev_sel.png b/icons/MVGreen/prev_sel.png
index 050f7d78..ad4aa675 100644
--- a/icons/MVGreen/prev_sel.png
+++ b/icons/MVGreen/prev_sel.png
Binary files differ
diff --git a/icons/MVGreen/recording_cutted.png b/icons/MVGreen/recording_cutted.png
index 220b04f9..aec90e37 100644
--- a/icons/MVGreen/recording_cutted.png
+++ b/icons/MVGreen/recording_cutted.png
Binary files differ
diff --git a/icons/MVGreen/recording_cutted_extra.png b/icons/MVGreen/recording_cutted_extra.png
index 5d0b338d..2d78f2de 100644
--- a/icons/MVGreen/recording_cutted_extra.png
+++ b/icons/MVGreen/recording_cutted_extra.png
Binary files differ
diff --git a/icons/MVGreen/recording_new.png b/icons/MVGreen/recording_new.png
index 702da7f5..961680fa 100644
--- a/icons/MVGreen/recording_new.png
+++ b/icons/MVGreen/recording_new.png
Binary files differ
diff --git a/icons/MVGreen/rewind_sel.png b/icons/MVGreen/rewind_sel.png
index 26b75d0f..e151baac 100644
--- a/icons/MVGreen/rewind_sel.png
+++ b/icons/MVGreen/rewind_sel.png
Binary files differ
diff --git a/icons/MVGreen/skip_sel.png b/icons/MVGreen/skip_sel.png
index 9aa25b33..08b2624b 100644
--- a/icons/MVGreen/skip_sel.png
+++ b/icons/MVGreen/skip_sel.png
Binary files differ
diff --git a/icons/MVGreen/timer_full.png b/icons/MVGreen/timer_full.png
index 2aacae75..172bd3b8 100644
--- a/icons/MVGreen/timer_full.png
+++ b/icons/MVGreen/timer_full.png
Binary files differ
diff --git a/icons/MVGreen/timer_partial.png b/icons/MVGreen/timer_partial.png
index 217e6ba2..f6d14a0a 100644
--- a/icons/MVGreen/timer_partial.png
+++ b/icons/MVGreen/timer_partial.png
Binary files differ
diff --git a/icons/MVGreen/vps.png b/icons/MVGreen/vps.png
index 5dc17592..f8369add 100644
--- a/icons/MVGreen/vps.png
+++ b/icons/MVGreen/vps.png
Binary files differ
diff --git a/icons/MVGreen2/changroup.png b/icons/MVGreen2/changroup.png
index 5bb556e6..250aac89 100644
--- a/icons/MVGreen2/changroup.png
+++ b/icons/MVGreen2/changroup.png
Binary files differ
diff --git a/icons/MVGreen2/forward_sel.png b/icons/MVGreen2/forward_sel.png
index 2fb001c5..be199b7e 100644
--- a/icons/MVGreen2/forward_sel.png
+++ b/icons/MVGreen2/forward_sel.png
Binary files differ
diff --git a/icons/MVGreen2/pause_sel.png b/icons/MVGreen2/pause_sel.png
index 0d219a06..b38493b2 100644
--- a/icons/MVGreen2/pause_sel.png
+++ b/icons/MVGreen2/pause_sel.png
Binary files differ
diff --git a/icons/MVGreen2/play_sel.png b/icons/MVGreen2/play_sel.png
index 55ba4d52..3db30755 100644
--- a/icons/MVGreen2/play_sel.png
+++ b/icons/MVGreen2/play_sel.png
Binary files differ
diff --git a/icons/MVGreen2/prev_sel.png b/icons/MVGreen2/prev_sel.png
index 050f7d78..ad4aa675 100644
--- a/icons/MVGreen2/prev_sel.png
+++ b/icons/MVGreen2/prev_sel.png
Binary files differ
diff --git a/icons/MVGreen2/recording_cutted.png b/icons/MVGreen2/recording_cutted.png
index 220b04f9..aec90e37 100644
--- a/icons/MVGreen2/recording_cutted.png
+++ b/icons/MVGreen2/recording_cutted.png
Binary files differ
diff --git a/icons/MVGreen2/recording_cutted_extra.png b/icons/MVGreen2/recording_cutted_extra.png
index 5d0b338d..2d78f2de 100644
--- a/icons/MVGreen2/recording_cutted_extra.png
+++ b/icons/MVGreen2/recording_cutted_extra.png
Binary files differ
diff --git a/icons/MVGreen2/recording_new.png b/icons/MVGreen2/recording_new.png
index 702da7f5..961680fa 100644
--- a/icons/MVGreen2/recording_new.png
+++ b/icons/MVGreen2/recording_new.png
Binary files differ
diff --git a/icons/MVGreen2/rewind_sel.png b/icons/MVGreen2/rewind_sel.png
index 26b75d0f..e151baac 100644
--- a/icons/MVGreen2/rewind_sel.png
+++ b/icons/MVGreen2/rewind_sel.png
Binary files differ
diff --git a/icons/MVGreen2/skip_sel.png b/icons/MVGreen2/skip_sel.png
index 9aa25b33..08b2624b 100644
--- a/icons/MVGreen2/skip_sel.png
+++ b/icons/MVGreen2/skip_sel.png
Binary files differ
diff --git a/icons/MVGreen2/timer_full.png b/icons/MVGreen2/timer_full.png
index 2aacae75..172bd3b8 100644
--- a/icons/MVGreen2/timer_full.png
+++ b/icons/MVGreen2/timer_full.png
Binary files differ
diff --git a/icons/MVGreen2/timer_partial.png b/icons/MVGreen2/timer_partial.png
index 217e6ba2..f6d14a0a 100644
--- a/icons/MVGreen2/timer_partial.png
+++ b/icons/MVGreen2/timer_partial.png
Binary files differ
diff --git a/icons/MVGreen2/vps.png b/icons/MVGreen2/vps.png
index 5dc17592..f8369add 100644
--- a/icons/MVGreen2/vps.png
+++ b/icons/MVGreen2/vps.png
Binary files differ
diff --git a/icons/MVGrey/changroup.png b/icons/MVGrey/changroup.png
index 9d2ee483..e1d88c78 100644
--- a/icons/MVGrey/changroup.png
+++ b/icons/MVGrey/changroup.png
Binary files differ
diff --git a/icons/MVGrey/forward_sel.png b/icons/MVGrey/forward_sel.png
index fceb56f1..e5bb8324 100644
--- a/icons/MVGrey/forward_sel.png
+++ b/icons/MVGrey/forward_sel.png
Binary files differ
diff --git a/icons/MVGrey/pause_sel.png b/icons/MVGrey/pause_sel.png
index bff42e3f..5351c689 100644
--- a/icons/MVGrey/pause_sel.png
+++ b/icons/MVGrey/pause_sel.png
Binary files differ
diff --git a/icons/MVGrey/play_sel.png b/icons/MVGrey/play_sel.png
index 7248ff50..d90d4096 100644
--- a/icons/MVGrey/play_sel.png
+++ b/icons/MVGrey/play_sel.png
Binary files differ
diff --git a/icons/MVGrey/prev_sel.png b/icons/MVGrey/prev_sel.png
index 718d4fbd..8280eccc 100644
--- a/icons/MVGrey/prev_sel.png
+++ b/icons/MVGrey/prev_sel.png
Binary files differ
diff --git a/icons/MVGrey/recording_cutted.png b/icons/MVGrey/recording_cutted.png
index fcefc667..32959dd4 100644
--- a/icons/MVGrey/recording_cutted.png
+++ b/icons/MVGrey/recording_cutted.png
Binary files differ
diff --git a/icons/MVGrey/recording_cutted_extra.png b/icons/MVGrey/recording_cutted_extra.png
index af505657..45ef6273 100644
--- a/icons/MVGrey/recording_cutted_extra.png
+++ b/icons/MVGrey/recording_cutted_extra.png
Binary files differ
diff --git a/icons/MVGrey/recording_new.png b/icons/MVGrey/recording_new.png
index 78029b05..eb41fe4d 100644
--- a/icons/MVGrey/recording_new.png
+++ b/icons/MVGrey/recording_new.png
Binary files differ
diff --git a/icons/MVGrey/rewind_sel.png b/icons/MVGrey/rewind_sel.png
index b08177af..f5ba3221 100644
--- a/icons/MVGrey/rewind_sel.png
+++ b/icons/MVGrey/rewind_sel.png
Binary files differ
diff --git a/icons/MVGrey/skip_sel.png b/icons/MVGrey/skip_sel.png
index df948893..1cc5faf6 100644
--- a/icons/MVGrey/skip_sel.png
+++ b/icons/MVGrey/skip_sel.png
Binary files differ
diff --git a/icons/MVGrey/timer_full.png b/icons/MVGrey/timer_full.png
index f901473f..fb979796 100644
--- a/icons/MVGrey/timer_full.png
+++ b/icons/MVGrey/timer_full.png
Binary files differ
diff --git a/icons/MVGrey/timer_partial.png b/icons/MVGrey/timer_partial.png
index f523a348..4cc2c991 100644
--- a/icons/MVGrey/timer_partial.png
+++ b/icons/MVGrey/timer_partial.png
Binary files differ
diff --git a/icons/MVGrey/vps.png b/icons/MVGrey/vps.png
index 51dbeeb7..8bb42373 100644
--- a/icons/MVGrey/vps.png
+++ b/icons/MVGrey/vps.png
Binary files differ
diff --git a/icons/MVHelloKitty/changroup.png b/icons/MVHelloKitty/changroup.png
index d9063d51..83527a0c 100644
--- a/icons/MVHelloKitty/changroup.png
+++ b/icons/MVHelloKitty/changroup.png
Binary files differ
diff --git a/icons/MVHelloKitty/forward_sel.png b/icons/MVHelloKitty/forward_sel.png
index 5f1a3dd0..ce158d9b 100644
--- a/icons/MVHelloKitty/forward_sel.png
+++ b/icons/MVHelloKitty/forward_sel.png
Binary files differ
diff --git a/icons/MVHelloKitty/pause_sel.png b/icons/MVHelloKitty/pause_sel.png
index aacd8a8f..5419fbe0 100644
--- a/icons/MVHelloKitty/pause_sel.png
+++ b/icons/MVHelloKitty/pause_sel.png
Binary files differ
diff --git a/icons/MVHelloKitty/play_sel.png b/icons/MVHelloKitty/play_sel.png
index aac11570..475dda98 100644
--- a/icons/MVHelloKitty/play_sel.png
+++ b/icons/MVHelloKitty/play_sel.png
Binary files differ
diff --git a/icons/MVHelloKitty/prev_sel.png b/icons/MVHelloKitty/prev_sel.png
index d5676b8f..d857c8b1 100644
--- a/icons/MVHelloKitty/prev_sel.png
+++ b/icons/MVHelloKitty/prev_sel.png
Binary files differ
diff --git a/icons/MVHelloKitty/recording_cutted.png b/icons/MVHelloKitty/recording_cutted.png
index df738ac4..8045fbc5 100644
--- a/icons/MVHelloKitty/recording_cutted.png
+++ b/icons/MVHelloKitty/recording_cutted.png
Binary files differ
diff --git a/icons/MVHelloKitty/recording_cutted_extra.png b/icons/MVHelloKitty/recording_cutted_extra.png
index ec49fa13..541d809c 100644
--- a/icons/MVHelloKitty/recording_cutted_extra.png
+++ b/icons/MVHelloKitty/recording_cutted_extra.png
Binary files differ
diff --git a/icons/MVHelloKitty/recording_new.png b/icons/MVHelloKitty/recording_new.png
index fef588c5..5bd22d16 100644
--- a/icons/MVHelloKitty/recording_new.png
+++ b/icons/MVHelloKitty/recording_new.png
Binary files differ
diff --git a/icons/MVHelloKitty/rewind_sel.png b/icons/MVHelloKitty/rewind_sel.png
index 48e3d4d0..f27945bf 100644
--- a/icons/MVHelloKitty/rewind_sel.png
+++ b/icons/MVHelloKitty/rewind_sel.png
Binary files differ
diff --git a/icons/MVHelloKitty/skip_sel.png b/icons/MVHelloKitty/skip_sel.png
index 3f857de5..2b9c6aa8 100644
--- a/icons/MVHelloKitty/skip_sel.png
+++ b/icons/MVHelloKitty/skip_sel.png
Binary files differ
diff --git a/icons/MVHelloKitty/timer_full.png b/icons/MVHelloKitty/timer_full.png
index dcc58df9..0b652940 100644
--- a/icons/MVHelloKitty/timer_full.png
+++ b/icons/MVHelloKitty/timer_full.png
Binary files differ
diff --git a/icons/MVHelloKitty/timer_partial.png b/icons/MVHelloKitty/timer_partial.png
index 9a9a61a6..0bb3542e 100644
--- a/icons/MVHelloKitty/timer_partial.png
+++ b/icons/MVHelloKitty/timer_partial.png
Binary files differ
diff --git a/icons/MVHelloKitty/vps.png b/icons/MVHelloKitty/vps.png
index eaf35a16..8131a9be 100644
--- a/icons/MVHelloKitty/vps.png
+++ b/icons/MVHelloKitty/vps.png
Binary files differ
diff --git a/icons/MVHelloKitty2/changroup.png b/icons/MVHelloKitty2/changroup.png
index d9063d51..83527a0c 100644
--- a/icons/MVHelloKitty2/changroup.png
+++ b/icons/MVHelloKitty2/changroup.png
Binary files differ
diff --git a/icons/MVHelloKitty2/forward_sel.png b/icons/MVHelloKitty2/forward_sel.png
index 5f1a3dd0..ce158d9b 100644
--- a/icons/MVHelloKitty2/forward_sel.png
+++ b/icons/MVHelloKitty2/forward_sel.png
Binary files differ
diff --git a/icons/MVHelloKitty2/pause_sel.png b/icons/MVHelloKitty2/pause_sel.png
index aacd8a8f..5419fbe0 100644
--- a/icons/MVHelloKitty2/pause_sel.png
+++ b/icons/MVHelloKitty2/pause_sel.png
Binary files differ
diff --git a/icons/MVHelloKitty2/play_sel.png b/icons/MVHelloKitty2/play_sel.png
index aac11570..475dda98 100644
--- a/icons/MVHelloKitty2/play_sel.png
+++ b/icons/MVHelloKitty2/play_sel.png
Binary files differ
diff --git a/icons/MVHelloKitty2/prev_sel.png b/icons/MVHelloKitty2/prev_sel.png
index d5676b8f..d857c8b1 100644
--- a/icons/MVHelloKitty2/prev_sel.png
+++ b/icons/MVHelloKitty2/prev_sel.png
Binary files differ
diff --git a/icons/MVHelloKitty2/recording_cutted.png b/icons/MVHelloKitty2/recording_cutted.png
index df738ac4..8045fbc5 100644
--- a/icons/MVHelloKitty2/recording_cutted.png
+++ b/icons/MVHelloKitty2/recording_cutted.png
Binary files differ
diff --git a/icons/MVHelloKitty2/recording_cutted_extra.png b/icons/MVHelloKitty2/recording_cutted_extra.png
index ec49fa13..541d809c 100644
--- a/icons/MVHelloKitty2/recording_cutted_extra.png
+++ b/icons/MVHelloKitty2/recording_cutted_extra.png
Binary files differ
diff --git a/icons/MVHelloKitty2/recording_new.png b/icons/MVHelloKitty2/recording_new.png
index fef588c5..5bd22d16 100644
--- a/icons/MVHelloKitty2/recording_new.png
+++ b/icons/MVHelloKitty2/recording_new.png
Binary files differ
diff --git a/icons/MVHelloKitty2/rewind_sel.png b/icons/MVHelloKitty2/rewind_sel.png
index 48e3d4d0..f27945bf 100644
--- a/icons/MVHelloKitty2/rewind_sel.png
+++ b/icons/MVHelloKitty2/rewind_sel.png
Binary files differ
diff --git a/icons/MVHelloKitty2/skip_sel.png b/icons/MVHelloKitty2/skip_sel.png
index 3f857de5..2b9c6aa8 100644
--- a/icons/MVHelloKitty2/skip_sel.png
+++ b/icons/MVHelloKitty2/skip_sel.png
Binary files differ
diff --git a/icons/MVHelloKitty2/timer_full.png b/icons/MVHelloKitty2/timer_full.png
index dcc58df9..0b652940 100644
--- a/icons/MVHelloKitty2/timer_full.png
+++ b/icons/MVHelloKitty2/timer_full.png
Binary files differ
diff --git a/icons/MVHelloKitty2/timer_partial.png b/icons/MVHelloKitty2/timer_partial.png
index 9a9a61a6..0bb3542e 100644
--- a/icons/MVHelloKitty2/timer_partial.png
+++ b/icons/MVHelloKitty2/timer_partial.png
Binary files differ
diff --git a/icons/MVHelloKitty2/vps.png b/icons/MVHelloKitty2/vps.png
index eaf35a16..8131a9be 100644
--- a/icons/MVHelloKitty2/vps.png
+++ b/icons/MVHelloKitty2/vps.png
Binary files differ
diff --git a/icons/MVLightBlue/changroup.png b/icons/MVLightBlue/changroup.png
index 9c3dc009..defd642c 100644
--- a/icons/MVLightBlue/changroup.png
+++ b/icons/MVLightBlue/changroup.png
Binary files differ
diff --git a/icons/MVLightBlue/forward_sel.png b/icons/MVLightBlue/forward_sel.png
index 66094ca1..af9c89fe 100644
--- a/icons/MVLightBlue/forward_sel.png
+++ b/icons/MVLightBlue/forward_sel.png
Binary files differ
diff --git a/icons/MVLightBlue/pause_sel.png b/icons/MVLightBlue/pause_sel.png
index c277dae4..2688b0dd 100644
--- a/icons/MVLightBlue/pause_sel.png
+++ b/icons/MVLightBlue/pause_sel.png
Binary files differ
diff --git a/icons/MVLightBlue/play_sel.png b/icons/MVLightBlue/play_sel.png
index 8da6d386..23d44b25 100644
--- a/icons/MVLightBlue/play_sel.png
+++ b/icons/MVLightBlue/play_sel.png
Binary files differ
diff --git a/icons/MVLightBlue/prev_sel.png b/icons/MVLightBlue/prev_sel.png
index 9516e4d8..e5c774ab 100644
--- a/icons/MVLightBlue/prev_sel.png
+++ b/icons/MVLightBlue/prev_sel.png
Binary files differ
diff --git a/icons/MVLightBlue/recording_cutted.png b/icons/MVLightBlue/recording_cutted.png
index 634e932e..ef396834 100644
--- a/icons/MVLightBlue/recording_cutted.png
+++ b/icons/MVLightBlue/recording_cutted.png
Binary files differ
diff --git a/icons/MVLightBlue/recording_cutted_extra.png b/icons/MVLightBlue/recording_cutted_extra.png
index c714050b..976abea4 100644
--- a/icons/MVLightBlue/recording_cutted_extra.png
+++ b/icons/MVLightBlue/recording_cutted_extra.png
Binary files differ
diff --git a/icons/MVLightBlue/recording_new.png b/icons/MVLightBlue/recording_new.png
index 13d63adc..7e137678 100644
--- a/icons/MVLightBlue/recording_new.png
+++ b/icons/MVLightBlue/recording_new.png
Binary files differ
diff --git a/icons/MVLightBlue/rewind_sel.png b/icons/MVLightBlue/rewind_sel.png
index d2e8069b..1609084e 100644
--- a/icons/MVLightBlue/rewind_sel.png
+++ b/icons/MVLightBlue/rewind_sel.png
Binary files differ
diff --git a/icons/MVLightBlue/skip_sel.png b/icons/MVLightBlue/skip_sel.png
index e32c3e14..dbee79e4 100644
--- a/icons/MVLightBlue/skip_sel.png
+++ b/icons/MVLightBlue/skip_sel.png
Binary files differ
diff --git a/icons/MVLightBlue/timer_full.png b/icons/MVLightBlue/timer_full.png
index b1c10320..03913f6f 100644
--- a/icons/MVLightBlue/timer_full.png
+++ b/icons/MVLightBlue/timer_full.png
Binary files differ
diff --git a/icons/MVLightBlue/timer_partial.png b/icons/MVLightBlue/timer_partial.png
index 918bfa15..1a520fcb 100644
--- a/icons/MVLightBlue/timer_partial.png
+++ b/icons/MVLightBlue/timer_partial.png
Binary files differ
diff --git a/icons/MVLightBlue/vps.png b/icons/MVLightBlue/vps.png
index 3f4c4284..559fd3cf 100644
--- a/icons/MVLightBlue/vps.png
+++ b/icons/MVLightBlue/vps.png
Binary files differ
diff --git a/icons/MVLightGreen/changroup.png b/icons/MVLightGreen/changroup.png
index e7630844..0c7d17fb 100644
--- a/icons/MVLightGreen/changroup.png
+++ b/icons/MVLightGreen/changroup.png
Binary files differ
diff --git a/icons/MVLightGreen/forward_sel.png b/icons/MVLightGreen/forward_sel.png
index f28c0cd5..3ba71cfa 100644
--- a/icons/MVLightGreen/forward_sel.png
+++ b/icons/MVLightGreen/forward_sel.png
Binary files differ
diff --git a/icons/MVLightGreen/pause_sel.png b/icons/MVLightGreen/pause_sel.png
index 2dd5474b..b7b66786 100644
--- a/icons/MVLightGreen/pause_sel.png
+++ b/icons/MVLightGreen/pause_sel.png
Binary files differ
diff --git a/icons/MVLightGreen/play_sel.png b/icons/MVLightGreen/play_sel.png
index 8df17cce..69d20d5a 100644
--- a/icons/MVLightGreen/play_sel.png
+++ b/icons/MVLightGreen/play_sel.png
Binary files differ
diff --git a/icons/MVLightGreen/prev_sel.png b/icons/MVLightGreen/prev_sel.png
index 8fa9b0d3..197a998c 100644
--- a/icons/MVLightGreen/prev_sel.png
+++ b/icons/MVLightGreen/prev_sel.png
Binary files differ
diff --git a/icons/MVLightGreen/recording_cutted.png b/icons/MVLightGreen/recording_cutted.png
index 38e00c98..6c04a50b 100644
--- a/icons/MVLightGreen/recording_cutted.png
+++ b/icons/MVLightGreen/recording_cutted.png
Binary files differ
diff --git a/icons/MVLightGreen/recording_cutted_extra.png b/icons/MVLightGreen/recording_cutted_extra.png
index 182640f2..d483338b 100644
--- a/icons/MVLightGreen/recording_cutted_extra.png
+++ b/icons/MVLightGreen/recording_cutted_extra.png
Binary files differ
diff --git a/icons/MVLightGreen/recording_new.png b/icons/MVLightGreen/recording_new.png
index 3994d1f6..40ba5a45 100644
--- a/icons/MVLightGreen/recording_new.png
+++ b/icons/MVLightGreen/recording_new.png
Binary files differ
diff --git a/icons/MVLightGreen/rewind_sel.png b/icons/MVLightGreen/rewind_sel.png
index d7050f06..ec0bb433 100644
--- a/icons/MVLightGreen/rewind_sel.png
+++ b/icons/MVLightGreen/rewind_sel.png
Binary files differ
diff --git a/icons/MVLightGreen/skip_sel.png b/icons/MVLightGreen/skip_sel.png
index 03d82113..93d96b24 100644
--- a/icons/MVLightGreen/skip_sel.png
+++ b/icons/MVLightGreen/skip_sel.png
Binary files differ
diff --git a/icons/MVLightGreen/timer_full.png b/icons/MVLightGreen/timer_full.png
index cbe53033..25be5c4a 100644
--- a/icons/MVLightGreen/timer_full.png
+++ b/icons/MVLightGreen/timer_full.png
Binary files differ
diff --git a/icons/MVLightGreen/timer_partial.png b/icons/MVLightGreen/timer_partial.png
index e48ddef4..eb25f717 100644
--- a/icons/MVLightGreen/timer_partial.png
+++ b/icons/MVLightGreen/timer_partial.png
Binary files differ
diff --git a/icons/MVLightGreen/vps.png b/icons/MVLightGreen/vps.png
index eef4b755..90209915 100644
--- a/icons/MVLightGreen/vps.png
+++ b/icons/MVLightGreen/vps.png
Binary files differ
diff --git a/icons/MVMint/changroup.png b/icons/MVMint/changroup.png
index e9e59cb8..3c9c1612 100644
--- a/icons/MVMint/changroup.png
+++ b/icons/MVMint/changroup.png
Binary files differ
diff --git a/icons/MVMint/forward_sel.png b/icons/MVMint/forward_sel.png
index 6933b19b..d3949bde 100644
--- a/icons/MVMint/forward_sel.png
+++ b/icons/MVMint/forward_sel.png
Binary files differ
diff --git a/icons/MVMint/pause_sel.png b/icons/MVMint/pause_sel.png
index 2decce80..07a6e776 100644
--- a/icons/MVMint/pause_sel.png
+++ b/icons/MVMint/pause_sel.png
Binary files differ
diff --git a/icons/MVMint/play_sel.png b/icons/MVMint/play_sel.png
index fd0043ac..8c61f0d6 100644
--- a/icons/MVMint/play_sel.png
+++ b/icons/MVMint/play_sel.png
Binary files differ
diff --git a/icons/MVMint/prev_sel.png b/icons/MVMint/prev_sel.png
index 69a5ad97..36007c01 100644
--- a/icons/MVMint/prev_sel.png
+++ b/icons/MVMint/prev_sel.png
Binary files differ
diff --git a/icons/MVMint/recording_cutted.png b/icons/MVMint/recording_cutted.png
index 18eb23cb..8362240b 100644
--- a/icons/MVMint/recording_cutted.png
+++ b/icons/MVMint/recording_cutted.png
Binary files differ
diff --git a/icons/MVMint/recording_cutted_extra.png b/icons/MVMint/recording_cutted_extra.png
index 5a42eed2..f5472d07 100644
--- a/icons/MVMint/recording_cutted_extra.png
+++ b/icons/MVMint/recording_cutted_extra.png
Binary files differ
diff --git a/icons/MVMint/recording_new.png b/icons/MVMint/recording_new.png
index dcb51561..15b4b63b 100644
--- a/icons/MVMint/recording_new.png
+++ b/icons/MVMint/recording_new.png
Binary files differ
diff --git a/icons/MVMint/rewind_sel.png b/icons/MVMint/rewind_sel.png
index e56b55dd..34df549f 100644
--- a/icons/MVMint/rewind_sel.png
+++ b/icons/MVMint/rewind_sel.png
Binary files differ
diff --git a/icons/MVMint/skip_sel.png b/icons/MVMint/skip_sel.png
index d9649a44..152f2fe4 100644
--- a/icons/MVMint/skip_sel.png
+++ b/icons/MVMint/skip_sel.png
Binary files differ
diff --git a/icons/MVMint/timer_full.png b/icons/MVMint/timer_full.png
index 0bfd6a35..d968bc09 100644
--- a/icons/MVMint/timer_full.png
+++ b/icons/MVMint/timer_full.png
Binary files differ
diff --git a/icons/MVMint/timer_partial.png b/icons/MVMint/timer_partial.png
index e4e6b8d3..0d5a4f4e 100644
--- a/icons/MVMint/timer_partial.png
+++ b/icons/MVMint/timer_partial.png
Binary files differ
diff --git a/icons/MVMint/vps.png b/icons/MVMint/vps.png
index 2c84aab9..8dd34578 100644
--- a/icons/MVMint/vps.png
+++ b/icons/MVMint/vps.png
Binary files differ
diff --git a/icons/MVNuts/changroup.png b/icons/MVNuts/changroup.png
index 1ba5a435..d0ac481b 100644
--- a/icons/MVNuts/changroup.png
+++ b/icons/MVNuts/changroup.png
Binary files differ
diff --git a/icons/MVNuts/forward_sel.png b/icons/MVNuts/forward_sel.png
index 09713bc2..6888f95e 100644
--- a/icons/MVNuts/forward_sel.png
+++ b/icons/MVNuts/forward_sel.png
Binary files differ
diff --git a/icons/MVNuts/pause_sel.png b/icons/MVNuts/pause_sel.png
index b1e27def..0828a93b 100644
--- a/icons/MVNuts/pause_sel.png
+++ b/icons/MVNuts/pause_sel.png
Binary files differ
diff --git a/icons/MVNuts/play_sel.png b/icons/MVNuts/play_sel.png
index 9357eef7..f278913e 100644
--- a/icons/MVNuts/play_sel.png
+++ b/icons/MVNuts/play_sel.png
Binary files differ
diff --git a/icons/MVNuts/prev_sel.png b/icons/MVNuts/prev_sel.png
index 5ea9f7a0..79f49d05 100644
--- a/icons/MVNuts/prev_sel.png
+++ b/icons/MVNuts/prev_sel.png
Binary files differ
diff --git a/icons/MVNuts/recording_cutted.png b/icons/MVNuts/recording_cutted.png
index 5cc4ae39..e2082727 100644
--- a/icons/MVNuts/recording_cutted.png
+++ b/icons/MVNuts/recording_cutted.png
Binary files differ
diff --git a/icons/MVNuts/recording_cutted_extra.png b/icons/MVNuts/recording_cutted_extra.png
index e4e8f4d3..8b74f9d8 100644
--- a/icons/MVNuts/recording_cutted_extra.png
+++ b/icons/MVNuts/recording_cutted_extra.png
Binary files differ
diff --git a/icons/MVNuts/recording_new.png b/icons/MVNuts/recording_new.png
index 970bf9d6..4398fb52 100644
--- a/icons/MVNuts/recording_new.png
+++ b/icons/MVNuts/recording_new.png
Binary files differ
diff --git a/icons/MVNuts/rewind_sel.png b/icons/MVNuts/rewind_sel.png
index 9d7f1d4d..1f5555d3 100644
--- a/icons/MVNuts/rewind_sel.png
+++ b/icons/MVNuts/rewind_sel.png
Binary files differ
diff --git a/icons/MVNuts/skip_sel.png b/icons/MVNuts/skip_sel.png
index b90144d4..77df1398 100644
--- a/icons/MVNuts/skip_sel.png
+++ b/icons/MVNuts/skip_sel.png
Binary files differ
diff --git a/icons/MVNuts/timer_full.png b/icons/MVNuts/timer_full.png
index 65b1e6db..6a74821e 100644
--- a/icons/MVNuts/timer_full.png
+++ b/icons/MVNuts/timer_full.png
Binary files differ
diff --git a/icons/MVNuts/timer_partial.png b/icons/MVNuts/timer_partial.png
index ce070d95..927fac18 100644
--- a/icons/MVNuts/timer_partial.png
+++ b/icons/MVNuts/timer_partial.png
Binary files differ
diff --git a/icons/MVNuts/vps.png b/icons/MVNuts/vps.png
index c19c3965..ca7ff425 100644
--- a/icons/MVNuts/vps.png
+++ b/icons/MVNuts/vps.png
Binary files differ
diff --git a/icons/MVOlive/changroup.png b/icons/MVOlive/changroup.png
index 13a69290..66b26549 100644
--- a/icons/MVOlive/changroup.png
+++ b/icons/MVOlive/changroup.png
Binary files differ
diff --git a/icons/MVOlive/forward_sel.png b/icons/MVOlive/forward_sel.png
index 8afcf1a3..5e56b3a8 100644
--- a/icons/MVOlive/forward_sel.png
+++ b/icons/MVOlive/forward_sel.png
Binary files differ
diff --git a/icons/MVOlive/pause_sel.png b/icons/MVOlive/pause_sel.png
index 3517a5a9..690b7226 100644
--- a/icons/MVOlive/pause_sel.png
+++ b/icons/MVOlive/pause_sel.png
Binary files differ
diff --git a/icons/MVOlive/play_sel.png b/icons/MVOlive/play_sel.png
index 85b9dd67..b163e9c6 100644
--- a/icons/MVOlive/play_sel.png
+++ b/icons/MVOlive/play_sel.png
Binary files differ
diff --git a/icons/MVOlive/prev_sel.png b/icons/MVOlive/prev_sel.png
index a1a49065..73ba2db0 100644
--- a/icons/MVOlive/prev_sel.png
+++ b/icons/MVOlive/prev_sel.png
Binary files differ
diff --git a/icons/MVOlive/recording_cutted.png b/icons/MVOlive/recording_cutted.png
index f2824925..4375aae5 100644
--- a/icons/MVOlive/recording_cutted.png
+++ b/icons/MVOlive/recording_cutted.png
Binary files differ
diff --git a/icons/MVOlive/recording_cutted_extra.png b/icons/MVOlive/recording_cutted_extra.png
index 8696d2a4..2dccfb37 100644
--- a/icons/MVOlive/recording_cutted_extra.png
+++ b/icons/MVOlive/recording_cutted_extra.png
Binary files differ
diff --git a/icons/MVOlive/recording_new.png b/icons/MVOlive/recording_new.png
index c23f2c84..17d3a876 100644
--- a/icons/MVOlive/recording_new.png
+++ b/icons/MVOlive/recording_new.png
Binary files differ
diff --git a/icons/MVOlive/rewind_sel.png b/icons/MVOlive/rewind_sel.png
index 93b17ca7..63eaf37c 100644
--- a/icons/MVOlive/rewind_sel.png
+++ b/icons/MVOlive/rewind_sel.png
Binary files differ
diff --git a/icons/MVOlive/skip_sel.png b/icons/MVOlive/skip_sel.png
index dc1dc2f0..18a39498 100644
--- a/icons/MVOlive/skip_sel.png
+++ b/icons/MVOlive/skip_sel.png
Binary files differ
diff --git a/icons/MVOlive/timer_full.png b/icons/MVOlive/timer_full.png
index 78016b3d..5833ff40 100644
--- a/icons/MVOlive/timer_full.png
+++ b/icons/MVOlive/timer_full.png
Binary files differ
diff --git a/icons/MVOlive/timer_partial.png b/icons/MVOlive/timer_partial.png
index 35601512..b38d0dbc 100644
--- a/icons/MVOlive/timer_partial.png
+++ b/icons/MVOlive/timer_partial.png
Binary files differ
diff --git a/icons/MVOlive/vps.png b/icons/MVOlive/vps.png
index 79a2fe6d..3cb32b10 100644
--- a/icons/MVOlive/vps.png
+++ b/icons/MVOlive/vps.png
Binary files differ
diff --git a/icons/MVPflaume/changroup.png b/icons/MVPflaume/changroup.png
index ea960405..f26f8fb4 100644
--- a/icons/MVPflaume/changroup.png
+++ b/icons/MVPflaume/changroup.png
Binary files differ
diff --git a/icons/MVPflaume/forward_sel.png b/icons/MVPflaume/forward_sel.png
index 779c250d..3d68af6a 100644
--- a/icons/MVPflaume/forward_sel.png
+++ b/icons/MVPflaume/forward_sel.png
Binary files differ
diff --git a/icons/MVPflaume/pause_sel.png b/icons/MVPflaume/pause_sel.png
index 460dd1dd..4f8b98d4 100644
--- a/icons/MVPflaume/pause_sel.png
+++ b/icons/MVPflaume/pause_sel.png
Binary files differ
diff --git a/icons/MVPflaume/play_sel.png b/icons/MVPflaume/play_sel.png
index fe6e9255..70be29e4 100644
--- a/icons/MVPflaume/play_sel.png
+++ b/icons/MVPflaume/play_sel.png
Binary files differ
diff --git a/icons/MVPflaume/prev_sel.png b/icons/MVPflaume/prev_sel.png
index 91d911a0..6163373b 100644
--- a/icons/MVPflaume/prev_sel.png
+++ b/icons/MVPflaume/prev_sel.png
Binary files differ
diff --git a/icons/MVPflaume/recording_cutted.png b/icons/MVPflaume/recording_cutted.png
index 78fd9209..f8a0cd9f 100644
--- a/icons/MVPflaume/recording_cutted.png
+++ b/icons/MVPflaume/recording_cutted.png
Binary files differ
diff --git a/icons/MVPflaume/recording_cutted_extra.png b/icons/MVPflaume/recording_cutted_extra.png
index 583adf48..90e10090 100644
--- a/icons/MVPflaume/recording_cutted_extra.png
+++ b/icons/MVPflaume/recording_cutted_extra.png
Binary files differ
diff --git a/icons/MVPflaume/recording_new.png b/icons/MVPflaume/recording_new.png
index b9893190..a31b78a3 100644
--- a/icons/MVPflaume/recording_new.png
+++ b/icons/MVPflaume/recording_new.png
Binary files differ
diff --git a/icons/MVPflaume/rewind_sel.png b/icons/MVPflaume/rewind_sel.png
index 086f3ab0..a449ce29 100644
--- a/icons/MVPflaume/rewind_sel.png
+++ b/icons/MVPflaume/rewind_sel.png
Binary files differ
diff --git a/icons/MVPflaume/skip_sel.png b/icons/MVPflaume/skip_sel.png
index 3d5f2b9d..23da2264 100644
--- a/icons/MVPflaume/skip_sel.png
+++ b/icons/MVPflaume/skip_sel.png
Binary files differ
diff --git a/icons/MVPflaume/timer_full.png b/icons/MVPflaume/timer_full.png
index 811a5f0a..7c745a90 100644
--- a/icons/MVPflaume/timer_full.png
+++ b/icons/MVPflaume/timer_full.png
Binary files differ
diff --git a/icons/MVPflaume/timer_partial.png b/icons/MVPflaume/timer_partial.png
index e5ddf5d3..314a4781 100644
--- a/icons/MVPflaume/timer_partial.png
+++ b/icons/MVPflaume/timer_partial.png
Binary files differ
diff --git a/icons/MVPflaume/vps.png b/icons/MVPflaume/vps.png
index 4d50b39f..ea06c884 100644
--- a/icons/MVPflaume/vps.png
+++ b/icons/MVPflaume/vps.png
Binary files differ
diff --git a/icons/MVPumpkin/changroup.png b/icons/MVPumpkin/changroup.png
index c6778af8..79c8ae30 100644
--- a/icons/MVPumpkin/changroup.png
+++ b/icons/MVPumpkin/changroup.png
Binary files differ
diff --git a/icons/MVPumpkin/forward_sel.png b/icons/MVPumpkin/forward_sel.png
index 9ac59d46..6872d0be 100644
--- a/icons/MVPumpkin/forward_sel.png
+++ b/icons/MVPumpkin/forward_sel.png
Binary files differ
diff --git a/icons/MVPumpkin/pause_sel.png b/icons/MVPumpkin/pause_sel.png
index a0ffb719..3485dfe0 100644
--- a/icons/MVPumpkin/pause_sel.png
+++ b/icons/MVPumpkin/pause_sel.png
Binary files differ
diff --git a/icons/MVPumpkin/play_sel.png b/icons/MVPumpkin/play_sel.png
index 90f1632d..4dfbf9e2 100644
--- a/icons/MVPumpkin/play_sel.png
+++ b/icons/MVPumpkin/play_sel.png
Binary files differ
diff --git a/icons/MVPumpkin/prev_sel.png b/icons/MVPumpkin/prev_sel.png
index 0db0cb7e..3fff2562 100644
--- a/icons/MVPumpkin/prev_sel.png
+++ b/icons/MVPumpkin/prev_sel.png
Binary files differ
diff --git a/icons/MVPumpkin/recording_cutted.png b/icons/MVPumpkin/recording_cutted.png
index e4efc0d5..3dca0195 100644
--- a/icons/MVPumpkin/recording_cutted.png
+++ b/icons/MVPumpkin/recording_cutted.png
Binary files differ
diff --git a/icons/MVPumpkin/recording_cutted_extra.png b/icons/MVPumpkin/recording_cutted_extra.png
index b19446fa..7280ee12 100644
--- a/icons/MVPumpkin/recording_cutted_extra.png
+++ b/icons/MVPumpkin/recording_cutted_extra.png
Binary files differ
diff --git a/icons/MVPumpkin/recording_new.png b/icons/MVPumpkin/recording_new.png
index 04ec1e9b..c5d3503c 100644
--- a/icons/MVPumpkin/recording_new.png
+++ b/icons/MVPumpkin/recording_new.png
Binary files differ
diff --git a/icons/MVPumpkin/rewind_sel.png b/icons/MVPumpkin/rewind_sel.png
index 2fa18c84..1001194d 100644
--- a/icons/MVPumpkin/rewind_sel.png
+++ b/icons/MVPumpkin/rewind_sel.png
Binary files differ
diff --git a/icons/MVPumpkin/skip_sel.png b/icons/MVPumpkin/skip_sel.png
index 95a6e051..d4f286aa 100644
--- a/icons/MVPumpkin/skip_sel.png
+++ b/icons/MVPumpkin/skip_sel.png
Binary files differ
diff --git a/icons/MVPumpkin/timer_full.png b/icons/MVPumpkin/timer_full.png
index d6cd0e5a..879ada48 100644
--- a/icons/MVPumpkin/timer_full.png
+++ b/icons/MVPumpkin/timer_full.png
Binary files differ
diff --git a/icons/MVPumpkin/timer_partial.png b/icons/MVPumpkin/timer_partial.png
index f46e0ce6..77e952d5 100644
--- a/icons/MVPumpkin/timer_partial.png
+++ b/icons/MVPumpkin/timer_partial.png
Binary files differ
diff --git a/icons/MVPumpkin/vps.png b/icons/MVPumpkin/vps.png
index 7e14f041..c71d1474 100644
--- a/icons/MVPumpkin/vps.png
+++ b/icons/MVPumpkin/vps.png
Binary files differ
diff --git a/icons/MVPurple/changroup.png b/icons/MVPurple/changroup.png
index 483569ae..4549e180 100644
--- a/icons/MVPurple/changroup.png
+++ b/icons/MVPurple/changroup.png
Binary files differ
diff --git a/icons/MVPurple/forward_sel.png b/icons/MVPurple/forward_sel.png
index b543221f..e3e058df 100644
--- a/icons/MVPurple/forward_sel.png
+++ b/icons/MVPurple/forward_sel.png
Binary files differ
diff --git a/icons/MVPurple/pause_sel.png b/icons/MVPurple/pause_sel.png
index f38e8f4e..d9c238cb 100644
--- a/icons/MVPurple/pause_sel.png
+++ b/icons/MVPurple/pause_sel.png
Binary files differ
diff --git a/icons/MVPurple/play_sel.png b/icons/MVPurple/play_sel.png
index 571c5a17..b4cef21b 100644
--- a/icons/MVPurple/play_sel.png
+++ b/icons/MVPurple/play_sel.png
Binary files differ
diff --git a/icons/MVPurple/prev_sel.png b/icons/MVPurple/prev_sel.png
index 5a11b55a..b34efcf8 100644
--- a/icons/MVPurple/prev_sel.png
+++ b/icons/MVPurple/prev_sel.png
Binary files differ
diff --git a/icons/MVPurple/recording_cutted.png b/icons/MVPurple/recording_cutted.png
index 36f70c5d..2198e333 100644
--- a/icons/MVPurple/recording_cutted.png
+++ b/icons/MVPurple/recording_cutted.png
Binary files differ
diff --git a/icons/MVPurple/recording_cutted_extra.png b/icons/MVPurple/recording_cutted_extra.png
index ac0b0e85..c0d0017d 100644
--- a/icons/MVPurple/recording_cutted_extra.png
+++ b/icons/MVPurple/recording_cutted_extra.png
Binary files differ
diff --git a/icons/MVPurple/recording_new.png b/icons/MVPurple/recording_new.png
index d3d3771a..4b3340fe 100644
--- a/icons/MVPurple/recording_new.png
+++ b/icons/MVPurple/recording_new.png
Binary files differ
diff --git a/icons/MVPurple/rewind_sel.png b/icons/MVPurple/rewind_sel.png
index d13cc087..3c29be5d 100644
--- a/icons/MVPurple/rewind_sel.png
+++ b/icons/MVPurple/rewind_sel.png
Binary files differ
diff --git a/icons/MVPurple/skip_sel.png b/icons/MVPurple/skip_sel.png
index 8fadd7e8..d622d350 100644
--- a/icons/MVPurple/skip_sel.png
+++ b/icons/MVPurple/skip_sel.png
Binary files differ
diff --git a/icons/MVPurple/timer_full.png b/icons/MVPurple/timer_full.png
index dcb7dd39..3253eab5 100644
--- a/icons/MVPurple/timer_full.png
+++ b/icons/MVPurple/timer_full.png
Binary files differ
diff --git a/icons/MVPurple/timer_partial.png b/icons/MVPurple/timer_partial.png
index cbf9f7c0..e80b9b4e 100644
--- a/icons/MVPurple/timer_partial.png
+++ b/icons/MVPurple/timer_partial.png
Binary files differ
diff --git a/icons/MVPurple/vps.png b/icons/MVPurple/vps.png
index ed6dd413..581940d6 100644
--- a/icons/MVPurple/vps.png
+++ b/icons/MVPurple/vps.png
Binary files differ
diff --git a/icons/MVPurpleGrey/changroup.png b/icons/MVPurpleGrey/changroup.png
index 42ec5166..240067eb 100644
--- a/icons/MVPurpleGrey/changroup.png
+++ b/icons/MVPurpleGrey/changroup.png
Binary files differ
diff --git a/icons/MVPurpleGrey/forward_sel.png b/icons/MVPurpleGrey/forward_sel.png
index 21121c9b..0ee64286 100644
--- a/icons/MVPurpleGrey/forward_sel.png
+++ b/icons/MVPurpleGrey/forward_sel.png
Binary files differ
diff --git a/icons/MVPurpleGrey/pause_sel.png b/icons/MVPurpleGrey/pause_sel.png
index e62119e3..98a0cf2f 100644
--- a/icons/MVPurpleGrey/pause_sel.png
+++ b/icons/MVPurpleGrey/pause_sel.png
Binary files differ
diff --git a/icons/MVPurpleGrey/play_sel.png b/icons/MVPurpleGrey/play_sel.png
index c7cd1ecd..2b6a9721 100644
--- a/icons/MVPurpleGrey/play_sel.png
+++ b/icons/MVPurpleGrey/play_sel.png
Binary files differ
diff --git a/icons/MVPurpleGrey/prev_sel.png b/icons/MVPurpleGrey/prev_sel.png
index 680d0b38..043e7e18 100644
--- a/icons/MVPurpleGrey/prev_sel.png
+++ b/icons/MVPurpleGrey/prev_sel.png
Binary files differ
diff --git a/icons/MVPurpleGrey/recording_cutted.png b/icons/MVPurpleGrey/recording_cutted.png
index e7cacf04..6b557897 100644
--- a/icons/MVPurpleGrey/recording_cutted.png
+++ b/icons/MVPurpleGrey/recording_cutted.png
Binary files differ
diff --git a/icons/MVPurpleGrey/recording_cutted_extra.png b/icons/MVPurpleGrey/recording_cutted_extra.png
index 4d073b81..0a3441e1 100644
--- a/icons/MVPurpleGrey/recording_cutted_extra.png
+++ b/icons/MVPurpleGrey/recording_cutted_extra.png
Binary files differ
diff --git a/icons/MVPurpleGrey/recording_new.png b/icons/MVPurpleGrey/recording_new.png
index c303f439..d23b038e 100644
--- a/icons/MVPurpleGrey/recording_new.png
+++ b/icons/MVPurpleGrey/recording_new.png
Binary files differ
diff --git a/icons/MVPurpleGrey/rewind_sel.png b/icons/MVPurpleGrey/rewind_sel.png
index 7a8bc5e0..c4dd1c38 100644
--- a/icons/MVPurpleGrey/rewind_sel.png
+++ b/icons/MVPurpleGrey/rewind_sel.png
Binary files differ
diff --git a/icons/MVPurpleGrey/skip_sel.png b/icons/MVPurpleGrey/skip_sel.png
index 42da8ded..5e2fd938 100644
--- a/icons/MVPurpleGrey/skip_sel.png
+++ b/icons/MVPurpleGrey/skip_sel.png
Binary files differ
diff --git a/icons/MVPurpleGrey/timer_full.png b/icons/MVPurpleGrey/timer_full.png
index bb34c67c..22808ce7 100644
--- a/icons/MVPurpleGrey/timer_full.png
+++ b/icons/MVPurpleGrey/timer_full.png
Binary files differ
diff --git a/icons/MVPurpleGrey/timer_partial.png b/icons/MVPurpleGrey/timer_partial.png
index 1b97ed49..a22113c2 100644
--- a/icons/MVPurpleGrey/timer_partial.png
+++ b/icons/MVPurpleGrey/timer_partial.png
Binary files differ
diff --git a/icons/MVPurpleGrey/vps.png b/icons/MVPurpleGrey/vps.png
index 2fc93e3c..d75e63b2 100644
--- a/icons/MVPurpleGrey/vps.png
+++ b/icons/MVPurpleGrey/vps.png
Binary files differ
diff --git a/icons/MVRauchglas/changroup.png b/icons/MVRauchglas/changroup.png
index 4c42a153..17b69ed6 100644
--- a/icons/MVRauchglas/changroup.png
+++ b/icons/MVRauchglas/changroup.png
Binary files differ
diff --git a/icons/MVRauchglas/forward_sel.png b/icons/MVRauchglas/forward_sel.png
index 3a00a404..8cb1fe22 100644
--- a/icons/MVRauchglas/forward_sel.png
+++ b/icons/MVRauchglas/forward_sel.png
Binary files differ
diff --git a/icons/MVRauchglas/pause_sel.png b/icons/MVRauchglas/pause_sel.png
index 19a2570f..82d2a478 100644
--- a/icons/MVRauchglas/pause_sel.png
+++ b/icons/MVRauchglas/pause_sel.png
Binary files differ
diff --git a/icons/MVRauchglas/play_sel.png b/icons/MVRauchglas/play_sel.png
index 027275a6..56374825 100644
--- a/icons/MVRauchglas/play_sel.png
+++ b/icons/MVRauchglas/play_sel.png
Binary files differ
diff --git a/icons/MVRauchglas/prev_sel.png b/icons/MVRauchglas/prev_sel.png
index 00af9f1e..75d56c3c 100644
--- a/icons/MVRauchglas/prev_sel.png
+++ b/icons/MVRauchglas/prev_sel.png
Binary files differ
diff --git a/icons/MVRauchglas/recording_cutted.png b/icons/MVRauchglas/recording_cutted.png
index 19c96d19..f41d0b1b 100644
--- a/icons/MVRauchglas/recording_cutted.png
+++ b/icons/MVRauchglas/recording_cutted.png
Binary files differ
diff --git a/icons/MVRauchglas/recording_cutted_extra.png b/icons/MVRauchglas/recording_cutted_extra.png
index fe49e413..06e5f514 100644
--- a/icons/MVRauchglas/recording_cutted_extra.png
+++ b/icons/MVRauchglas/recording_cutted_extra.png
Binary files differ
diff --git a/icons/MVRauchglas/recording_new.png b/icons/MVRauchglas/recording_new.png
index 6a05f88a..9156b4de 100644
--- a/icons/MVRauchglas/recording_new.png
+++ b/icons/MVRauchglas/recording_new.png
Binary files differ
diff --git a/icons/MVRauchglas/rewind_sel.png b/icons/MVRauchglas/rewind_sel.png
index d0e34014..55307dfd 100644
--- a/icons/MVRauchglas/rewind_sel.png
+++ b/icons/MVRauchglas/rewind_sel.png
Binary files differ
diff --git a/icons/MVRauchglas/skip_sel.png b/icons/MVRauchglas/skip_sel.png
index bc4cb269..59e8780c 100644
--- a/icons/MVRauchglas/skip_sel.png
+++ b/icons/MVRauchglas/skip_sel.png
Binary files differ
diff --git a/icons/MVRauchglas/timer_full.png b/icons/MVRauchglas/timer_full.png
index ad1e9be2..f83ee033 100644
--- a/icons/MVRauchglas/timer_full.png
+++ b/icons/MVRauchglas/timer_full.png
Binary files differ
diff --git a/icons/MVRauchglas/timer_partial.png b/icons/MVRauchglas/timer_partial.png
index acd36bbc..582fdf2d 100644
--- a/icons/MVRauchglas/timer_partial.png
+++ b/icons/MVRauchglas/timer_partial.png
Binary files differ
diff --git a/icons/MVRauchglas/vps.png b/icons/MVRauchglas/vps.png
index 6e829917..29cff0fd 100644
--- a/icons/MVRauchglas/vps.png
+++ b/icons/MVRauchglas/vps.png
Binary files differ
diff --git a/icons/MVRed/changroup.png b/icons/MVRed/changroup.png
index e486b63b..ea57ac34 100644
--- a/icons/MVRed/changroup.png
+++ b/icons/MVRed/changroup.png
Binary files differ
diff --git a/icons/MVRed/forward_sel.png b/icons/MVRed/forward_sel.png
index f5ec8834..c11332af 100644
--- a/icons/MVRed/forward_sel.png
+++ b/icons/MVRed/forward_sel.png
Binary files differ
diff --git a/icons/MVRed/pause_sel.png b/icons/MVRed/pause_sel.png
index 31f5e137..d5a67233 100644
--- a/icons/MVRed/pause_sel.png
+++ b/icons/MVRed/pause_sel.png
Binary files differ
diff --git a/icons/MVRed/play_sel.png b/icons/MVRed/play_sel.png
index f5161912..f0c63a2a 100644
--- a/icons/MVRed/play_sel.png
+++ b/icons/MVRed/play_sel.png
Binary files differ
diff --git a/icons/MVRed/prev_sel.png b/icons/MVRed/prev_sel.png
index 044e5459..1ecff90d 100644
--- a/icons/MVRed/prev_sel.png
+++ b/icons/MVRed/prev_sel.png
Binary files differ
diff --git a/icons/MVRed/recording_cutted.png b/icons/MVRed/recording_cutted.png
index 1910a570..d11ebb6a 100644
--- a/icons/MVRed/recording_cutted.png
+++ b/icons/MVRed/recording_cutted.png
Binary files differ
diff --git a/icons/MVRed/recording_cutted_extra.png b/icons/MVRed/recording_cutted_extra.png
index 1206f088..c891ffbc 100644
--- a/icons/MVRed/recording_cutted_extra.png
+++ b/icons/MVRed/recording_cutted_extra.png
Binary files differ
diff --git a/icons/MVRed/recording_new.png b/icons/MVRed/recording_new.png
index 5b65190f..e1ce4f8c 100644
--- a/icons/MVRed/recording_new.png
+++ b/icons/MVRed/recording_new.png
Binary files differ
diff --git a/icons/MVRed/rewind_sel.png b/icons/MVRed/rewind_sel.png
index bcfc5874..e40e02ef 100644
--- a/icons/MVRed/rewind_sel.png
+++ b/icons/MVRed/rewind_sel.png
Binary files differ
diff --git a/icons/MVRed/skip_sel.png b/icons/MVRed/skip_sel.png
index 44787f34..0b585f59 100644
--- a/icons/MVRed/skip_sel.png
+++ b/icons/MVRed/skip_sel.png
Binary files differ
diff --git a/icons/MVRed/timer_full.png b/icons/MVRed/timer_full.png
index b758b6d8..9b2853b5 100644
--- a/icons/MVRed/timer_full.png
+++ b/icons/MVRed/timer_full.png
Binary files differ
diff --git a/icons/MVRed/timer_partial.png b/icons/MVRed/timer_partial.png
index 7a5321ef..33beda51 100644
--- a/icons/MVRed/timer_partial.png
+++ b/icons/MVRed/timer_partial.png
Binary files differ
diff --git a/icons/MVRed/vps.png b/icons/MVRed/vps.png
index a93532cc..3a17dba6 100644
--- a/icons/MVRed/vps.png
+++ b/icons/MVRed/vps.png
Binary files differ
diff --git a/icons/MVXMAS/changroup.png b/icons/MVXMAS/changroup.png
index 373ad164..0fbafa2e 100644
--- a/icons/MVXMAS/changroup.png
+++ b/icons/MVXMAS/changroup.png
Binary files differ
diff --git a/icons/MVXMAS/forward_sel.png b/icons/MVXMAS/forward_sel.png
index 7c52ba80..00573f65 100644
--- a/icons/MVXMAS/forward_sel.png
+++ b/icons/MVXMAS/forward_sel.png
Binary files differ
diff --git a/icons/MVXMAS/pause_sel.png b/icons/MVXMAS/pause_sel.png
index 1099eed5..57b7ac8b 100644
--- a/icons/MVXMAS/pause_sel.png
+++ b/icons/MVXMAS/pause_sel.png
Binary files differ
diff --git a/icons/MVXMAS/play_sel.png b/icons/MVXMAS/play_sel.png
index ee3ccd55..28508b51 100644
--- a/icons/MVXMAS/play_sel.png
+++ b/icons/MVXMAS/play_sel.png
Binary files differ
diff --git a/icons/MVXMAS/prev_sel.png b/icons/MVXMAS/prev_sel.png
index 9cc0f798..9b594ee7 100644
--- a/icons/MVXMAS/prev_sel.png
+++ b/icons/MVXMAS/prev_sel.png
Binary files differ
diff --git a/icons/MVXMAS/recording_cutted.png b/icons/MVXMAS/recording_cutted.png
index 73f23ffe..69b0dc8c 100644
--- a/icons/MVXMAS/recording_cutted.png
+++ b/icons/MVXMAS/recording_cutted.png
Binary files differ
diff --git a/icons/MVXMAS/recording_cutted_extra.png b/icons/MVXMAS/recording_cutted_extra.png
index fe1958eb..e9006963 100644
--- a/icons/MVXMAS/recording_cutted_extra.png
+++ b/icons/MVXMAS/recording_cutted_extra.png
Binary files differ
diff --git a/icons/MVXMAS/recording_new.png b/icons/MVXMAS/recording_new.png
index 5ddb5d3b..c3cf47bd 100644
--- a/icons/MVXMAS/recording_new.png
+++ b/icons/MVXMAS/recording_new.png
Binary files differ
diff --git a/icons/MVXMAS/rewind_sel.png b/icons/MVXMAS/rewind_sel.png
index 39b98bfa..52e5cc47 100644
--- a/icons/MVXMAS/rewind_sel.png
+++ b/icons/MVXMAS/rewind_sel.png
Binary files differ
diff --git a/icons/MVXMAS/skip_sel.png b/icons/MVXMAS/skip_sel.png
index fa85ad82..6bd69b57 100644
--- a/icons/MVXMAS/skip_sel.png
+++ b/icons/MVXMAS/skip_sel.png
Binary files differ
diff --git a/icons/MVXMAS/timer_full.png b/icons/MVXMAS/timer_full.png
index f8d5f8c9..a2eaa5c1 100644
--- a/icons/MVXMAS/timer_full.png
+++ b/icons/MVXMAS/timer_full.png
Binary files differ
diff --git a/icons/MVXMAS/timer_partial.png b/icons/MVXMAS/timer_partial.png
index 4d65ed8b..fbb3d925 100644
--- a/icons/MVXMAS/timer_partial.png
+++ b/icons/MVXMAS/timer_partial.png
Binary files differ
diff --git a/icons/MVXMAS/vps.png b/icons/MVXMAS/vps.png
index 6e27b152..ec236eed 100644
--- a/icons/MVXMAS/vps.png
+++ b/icons/MVXMAS/vps.png
Binary files differ
diff --git a/icons/MVdefault/169.png b/icons/MVdefault/169.png
index 207a4a4f..22fc33a7 100644
--- a/icons/MVdefault/169.png
+++ b/icons/MVdefault/169.png
Binary files differ
diff --git a/icons/MVdefault/221.png b/icons/MVdefault/221.png
index 376946c7..1bd8e60c 100644
--- a/icons/MVdefault/221.png
+++ b/icons/MVdefault/221.png
Binary files differ
diff --git a/icons/MVdefault/43.png b/icons/MVdefault/43.png
index afd9cce3..5011739f 100644
--- a/icons/MVdefault/43.png
+++ b/icons/MVdefault/43.png
Binary files differ
diff --git a/icons/MVdefault/crypted.png b/icons/MVdefault/crypted.png
index 4b3e54d9..d055fa23 100644
--- a/icons/MVdefault/crypted.png
+++ b/icons/MVdefault/crypted.png
Binary files differ
diff --git a/icons/MVdefault/forward.png b/icons/MVdefault/forward.png
index d6491c2f..ed56daf9 100644
--- a/icons/MVdefault/forward.png
+++ b/icons/MVdefault/forward.png
Binary files differ
diff --git a/icons/MVdefault/hd.png b/icons/MVdefault/hd.png
index 81c58b44..15ab4bca 100644
--- a/icons/MVdefault/hd.png
+++ b/icons/MVdefault/hd.png
Binary files differ
diff --git a/icons/MVdefault/pause.png b/icons/MVdefault/pause.png
index 2489c1c3..f714df25 100644
--- a/icons/MVdefault/pause.png
+++ b/icons/MVdefault/pause.png
Binary files differ
diff --git a/icons/MVdefault/play.png b/icons/MVdefault/play.png
index 332e6321..c4b8a469 100644
--- a/icons/MVdefault/play.png
+++ b/icons/MVdefault/play.png
Binary files differ
diff --git a/icons/MVdefault/prev.png b/icons/MVdefault/prev.png
index a649c96b..97c35f48 100644
--- a/icons/MVdefault/prev.png
+++ b/icons/MVdefault/prev.png
Binary files differ
diff --git a/icons/MVdefault/rewind.png b/icons/MVdefault/rewind.png
index c5bd4906..7287978b 100644
--- a/icons/MVdefault/rewind.png
+++ b/icons/MVdefault/rewind.png
Binary files differ
diff --git a/icons/MVdefault/sd.png b/icons/MVdefault/sd.png
index 85d61ee2..f1faebcb 100644
--- a/icons/MVdefault/sd.png
+++ b/icons/MVdefault/sd.png
Binary files differ
diff --git a/icons/MVdefault/skip.png b/icons/MVdefault/skip.png
index 982ccf00..6209158e 100644
--- a/icons/MVdefault/skip.png
+++ b/icons/MVdefault/skip.png
Binary files differ
diff --git a/icons/MVdefault/uncrypted.png b/icons/MVdefault/uncrypted.png
index dfe2efbc..b8368053 100644
--- a/icons/MVdefault/uncrypted.png
+++ b/icons/MVdefault/uncrypted.png
Binary files differ
diff --git a/icons/default/folder.png b/icons/default/folder.png
index 554b0d81..d9ce74ec 100644
--- a/icons/default/folder.png
+++ b/icons/default/folder.png
Binary files differ
diff --git a/po/de_DE.po b/po/de_DE.po
index 9d5014cc..e86b28bd 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: vdr-skinflat 0.3.1\n"
"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-07-13 12:09+0200\n"
+"POT-Creation-Date: 2014-08-03 22:10+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -312,6 +312,9 @@ msgstr "TopBar zeige Aufnahme"
msgid "TopBar show conflicts"
msgstr "TopBar zeige Konflikte"
+msgid "TopBar clock font scale"
+msgstr "TopBar Uhr Skalierung"
+
msgid "Conflicts min value for red"
msgstr "Konflikte min Wert für Rot"
@@ -378,6 +381,9 @@ msgstr "Zeige Auflösung & Aspect"
msgid "Show format (hd/sd)"
msgstr "Zeige Format (hd/sd)"
+msgid "Show video/audio bitrate"
+msgstr "Zeige Video/Audio Bitrate"
+
msgid "Simple aspect & format"
msgstr "Einfache Aspekt und Formatanzeige"
@@ -498,6 +504,9 @@ msgstr "Menüitem Progress Größe"
msgid "Replay border by decor-file?"
msgstr "Replay Rand von Decordatei?"
+msgid "Draw small seconds"
+msgstr "Zeichne kleine Sekunden"
+
msgid "Replay border type"
msgstr "Replay Rand Typ"
diff --git a/preview/Berry.png b/preview/Berry.png
new file mode 100644
index 00000000..9b6d1d32
--- /dev/null
+++ b/preview/Berry.png
Binary files differ
diff --git a/preview/Blood.png b/preview/Blood.png
new file mode 100644
index 00000000..39e7f266
--- /dev/null
+++ b/preview/Blood.png
Binary files differ
diff --git a/preview/Blue.png b/preview/Blue.png
new file mode 100644
index 00000000..e6df66db
--- /dev/null
+++ b/preview/Blue.png
Binary files differ
diff --git a/preview/Cappuchino.png b/preview/Cappuchino.png
new file mode 100644
index 00000000..9d8e550d
--- /dev/null
+++ b/preview/Cappuchino.png
Binary files differ
diff --git a/preview/Chocolate.png b/preview/Chocolate.png
new file mode 100644
index 00000000..9e70bfb2
--- /dev/null
+++ b/preview/Chocolate.png
Binary files differ
diff --git a/preview/Cyan.png b/preview/Cyan.png
new file mode 100644
index 00000000..b1f04e77
--- /dev/null
+++ b/preview/Cyan.png
Binary files differ
diff --git a/preview/DeepBlue.png b/preview/DeepBlue.png
new file mode 100644
index 00000000..b24f31f9
--- /dev/null
+++ b/preview/DeepBlue.png
Binary files differ
diff --git a/preview/Fog.png b/preview/Fog.png
new file mode 100644
index 00000000..37cc2056
--- /dev/null
+++ b/preview/Fog.png
Binary files differ
diff --git a/preview/Grapefruit.png b/preview/Grapefruit.png
new file mode 100644
index 00000000..ad500d9b
--- /dev/null
+++ b/preview/Grapefruit.png
Binary files differ
diff --git a/preview/Green.png b/preview/Green.png
new file mode 100644
index 00000000..47064976
--- /dev/null
+++ b/preview/Green.png
Binary files differ
diff --git a/preview/Green2.png b/preview/Green2.png
new file mode 100644
index 00000000..b690532a
--- /dev/null
+++ b/preview/Green2.png
Binary files differ
diff --git a/preview/Grey.png b/preview/Grey.png
new file mode 100644
index 00000000..3d1d5b0a
--- /dev/null
+++ b/preview/Grey.png
Binary files differ
diff --git a/preview/HelloKitty.png b/preview/HelloKitty.png
new file mode 100644
index 00000000..f6b68639
--- /dev/null
+++ b/preview/HelloKitty.png
Binary files differ
diff --git a/preview/HelloKitty2.png b/preview/HelloKitty2.png
new file mode 100644
index 00000000..2a579c3a
--- /dev/null
+++ b/preview/HelloKitty2.png
Binary files differ
diff --git a/preview/LightBlue.png b/preview/LightBlue.png
new file mode 100644
index 00000000..786495c8
--- /dev/null
+++ b/preview/LightBlue.png
Binary files differ
diff --git a/preview/LightGreen.png b/preview/LightGreen.png
new file mode 100644
index 00000000..4ed26b33
--- /dev/null
+++ b/preview/LightGreen.png
Binary files differ
diff --git a/preview/Mint.png b/preview/Mint.png
new file mode 100644
index 00000000..fe2102c7
--- /dev/null
+++ b/preview/Mint.png
Binary files differ
diff --git a/preview/Nuts.png b/preview/Nuts.png
new file mode 100644
index 00000000..70eaf8ee
--- /dev/null
+++ b/preview/Nuts.png
Binary files differ
diff --git a/preview/Olive.png b/preview/Olive.png
new file mode 100644
index 00000000..8dff6096
--- /dev/null
+++ b/preview/Olive.png
Binary files differ
diff --git a/preview/Pflaume.png b/preview/Pflaume.png
new file mode 100644
index 00000000..bd5263bd
--- /dev/null
+++ b/preview/Pflaume.png
Binary files differ
diff --git a/preview/Pumpkin.png b/preview/Pumpkin.png
new file mode 100644
index 00000000..0fb5f53c
--- /dev/null
+++ b/preview/Pumpkin.png
Binary files differ
diff --git a/preview/Purple.png b/preview/Purple.png
new file mode 100644
index 00000000..b97f8e0d
--- /dev/null
+++ b/preview/Purple.png
Binary files differ
diff --git a/preview/PurpleGrey.png b/preview/PurpleGrey.png
new file mode 100644
index 00000000..0070f4e5
--- /dev/null
+++ b/preview/PurpleGrey.png
Binary files differ
diff --git a/preview/Rauchglas.png b/preview/Rauchglas.png
new file mode 100644
index 00000000..41489646
--- /dev/null
+++ b/preview/Rauchglas.png
Binary files differ
diff --git a/preview/Red.png b/preview/Red.png
new file mode 100644
index 00000000..f8d80f06
--- /dev/null
+++ b/preview/Red.png
Binary files differ
diff --git a/preview/XMAS.png b/preview/XMAS.png
new file mode 100644
index 00000000..c77ffb66
--- /dev/null
+++ b/preview/XMAS.png
Binary files differ
diff --git a/setup.c b/setup.c
index bf253e84..c6f50627 100644
--- a/setup.c
+++ b/setup.c
@@ -253,6 +253,9 @@ void cFlatSetup::Store(void) {
SetupStore("ScrollerType", Config.ScrollerType);
SetupStore("DiskUsageShort", Config.DiskUsageShort);
SetupStore("DiskUsageFree", Config.DiskUsageFree);
+ SetupStore("TopBarFontClockScale", dtoa(Config.TopBarFontClockScale));
+ SetupStore("RecordingSmallSecs", Config.RecordingSmallSecs);
+ SetupStore("ChannelBitrateShow", Config.ChannelBitrateShow);
Config.Init();
}
@@ -300,6 +303,7 @@ void cFlatSetupGeneral::Setup(void) {
Add(new cMenuEditPrcItem(tr("TopBar font size"), &SetupConfig->TopBarFontSize, 0.01, 0.2, 1));
Add(new cMenuEditBoolItem(tr("TopBar show recording"), &SetupConfig->TopBarRecordingShow));
Add(new cMenuEditBoolItem(tr("TopBar show conflicts"), &SetupConfig->TopBarRecConflictsShow));
+ Add(new cMenuEditPrcItem(tr("TopBar clock font scale"), &SetupConfig->TopBarFontClockScale, 0.005, 0.02, 1));
Add(new cMenuEditIntItem(tr("Conflicts min value for red"), &SetupConfig->TopBarRecConflictsHigh));
Add(new cMenuEditIntItem(tr("Message bottom offset"), &SetupConfig->MessageOffset));
Add(new cMenuEditStraItem(tr("Message color position"), &SetupConfig->MessageColorPosition, MessageColorPositions.Size(), &MessageColorPositions[0]));
@@ -399,6 +403,7 @@ void cFlatSetupChannelInfo::Setup(void) {
Add(new cMenuEditBoolItem(tr("Colors for signal quality"), &SetupConfig->SignalQualityUseColors));
Add(new cMenuEditBoolItem(tr("Show resolution & aspect"), &SetupConfig->ChannelResolutionAspectShow));
Add(new cMenuEditBoolItem(tr("Show format (hd/sd)"), &SetupConfig->ChannelFormatShow));
+ Add(new cMenuEditBoolItem(tr("Show video/audio bitrate"), &SetupConfig->ChannelBitrateShow));
Add(new cMenuEditBoolItem(tr("Simple aspect & format"), &SetupConfig->ChannelSimpleAspectFormat));
Add(new cMenuEditBoolItem(tr("Channelinfo border by decor-file?"), &SetupConfig->decorBorderChannelByTheme));
@@ -598,6 +603,7 @@ void cFlatSetupReplay::Setup(void) {
Add(new cMenuEditBoolItem(tr("Show resolution & aspect"), &SetupConfig->RecordingResolutionAspectShow));
Add(new cMenuEditBoolItem(tr("Show format (hd/sd)"), &SetupConfig->RecordingFormatShow));
Add(new cMenuEditBoolItem(tr("Simple aspect & format"), &SetupConfig->RecordingSimpleAspectFormat));
+ Add(new cMenuEditBoolItem(tr("Draw small seconds"), &SetupConfig->RecordingSmallSecs));
if( SetupConfig->decorBorderReplayByTheme ) {
cString type = cString::sprintf("%s:\t%s", tr("Replay border type"), Bordertypes[SetupConfig->decorBorderReplayTypeTheme]);