Egor00f/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

use fplay_run to run Fplay with parameter wrapped into '"'

Browse Source 
git-svn-id: svn://kolibrios.org@7203 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2018-03-22 14:36:04 +00:00
parent 2ece3b26d7
commit 444e038420
8 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/Tupfile.lua
View File

@ -250,6 +250,7 @@ extra_files = {
{"kolibrios/lib/swresample-1.dll", "common/lib/swresample-1.dll"}, {"kolibrios/lib/swresample-1.dll", "common/lib/swresample-1.dll"},
{"kolibrios/lib/i915_dri.drv", "common/lib/i915_dri.drv"}, {"kolibrios/lib/i915_dri.drv", "common/lib/i915_dri.drv"},
{"kolibrios/media/fplay", "common/media/fplay"}, {"kolibrios/media/fplay", "common/media/fplay"},
{"kolibrios/media/fplay_run", "common/media/fplay_run"},
{"kolibrios/media/updf", "common/media/updf"}, {"kolibrios/media/updf", "common/media/updf"},
{"kolibrios/media/vttf", "common/media/vttf"}, {"kolibrios/media/vttf", "common/media/vttf"},
{"kolibrios/media/zsea/zsea.ini", PROGS .. "/media/zsea/zSea.ini"}, {"kolibrios/media/zsea/zsea.ini", PROGS .. "/media/zsea/zSea.ini"},

22
data/common/File Managers/kfar.ini
View File

@ -39,17 +39,17 @@ fb2=/sys/fb2read
mht=/sys/network/WebView mht=/sys/network/WebView
kla=/sys/games/klavisha kla=/sys/games/klavisha
pdf=/kolibrios/media/updf pdf=/kolibrios/media/updf
avi=/kolibrios/media/fplay avi=/kolibrios/media/fplay_run
mpg=/kolibrios/media/fplay mpg=/kolibrios/media/fplay_run
mov=/kolibrios/media/fplay mov=/kolibrios/media/fplay_run
flv=/kolibrios/media/fplay flv=/kolibrios/media/fplay_run
wmv=/kolibrios/media/fplay wmv=/kolibrios/media/fplay_run
vob=/kolibrios/media/fplay vob=/kolibrios/media/fplay_run
mkv=/kolibrios/media/fplay mkv=/kolibrios/media/fplay_run
mp4=/kolibrios/media/fplay mp4=/kolibrios/media/fplay_run
mpeg=/kolibrios/media/fplay mpeg=/kolibrios/media/fplay_run
3gp=/kolibrios/media/fplay 3gp=/kolibrios/media/fplay_run
webm=/kolibrios/media/fplay webm=/kolibrios/media/fplay_run
sh=/sys/shell sh=/sys/shell
smc=/kolibrios/emul/zsnes smc=/kolibrios/emul/zsnes
mcr=/kolibrios/emul/psx4all mcr=/kolibrios/emul/psx4all

22
data/common/File Managers/kfm.ini
View File

@ -182,17 +182,17 @@ asc /sys/3d/view3ds
lif /kolibrios/demos/life2 lif /kolibrios/demos/life2
skn /sys/skincfg skn /sys/skincfg
pdf /kolibrios/media/updf pdf /kolibrios/media/updf
avi /kolibrios/media/fplay avi /kolibrios/media/fplay_run
mpg /kolibrios/media/fplay mpg /kolibrios/media/fplay_run
mov /kolibrios/media/fplay mov /kolibrios/media/fplay_run
flv /kolibrios/media/fplay flv /kolibrios/media/fplay_run
wmv /kolibrios/media/fplay wmv /kolibrios/media/fplay_run
vob /kolibrios/media/fplay vob /kolibrios/media/fplay_run
mkv /kolibrios/media/fplay mkv /kolibrios/media/fplay_run
mp4 /kolibrios/media/fplay mp4 /kolibrios/media/fplay_run
mpeg /kolibrios/media/fplay mpeg /kolibrios/media/fplay_run
3gp /kolibrios/media/fplay 3gp /kolibrios/media/fplay_run
webm /kolibrios/media/fplay webm /kolibrios/media/fplay_run
smc=/kolibrios/emul/zsnes smc=/kolibrios/emul/zsnes
mcr=/kolibrios/emul/psx4all mcr=/kolibrios/emul/psx4all
nes=/kolibrios/emul/fceu/fceu nes=/kolibrios/emul/fceu/fceu

BIN
data/common/icons16.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.7 KiB

After

Width:  |  Height:  |  Size: 9.9 KiB

BIN
data/common/media/fplay_run Normal file
View File

Binary file not shown.

2
data/common/settings/assoc.ini
View File

@ -42,7 +42,7 @@ exec=/kolibrios/emul/dosbox/dosbox
icon=11 icon=11
[FPlay] [FPlay]
exec=/kolibrios/media/fplay exec=/kolibrios/media/fplay_run
icon=40 icon=40
[AC97snd] [AC97snd]

4
programs/cmm/eolite/Eolite.c
View File

@ -156,8 +156,8 @@ void main()
Libimg_LoadImage(#icons16_default, "/sys/icons16.png"); Libimg_LoadImage(#icons16_default, "/sys/icons16.png");
Libimg_LoadImage(#icons16_selected, "/sys/icons16.png"); Libimg_LoadImage(#icons16_selected, "/sys/icons16.png");
Libimg_ReplaceColor(icons16_selected.image, icons16_selected.w, icons16_selected.h, 0xffFFFfff, 0xFF94AECE); Libimg_ReplaceColor(icons16_selected.image, icons16_selected.w, icons16_selected.h, 0xffFFFfff, col_selec);
Libimg_ReplaceColor(icons16_selected.image, icons16_selected.w, icons16_selected.h, 0xffCACBD6, 0xFF7692B5); Libimg_ReplaceColor(icons16_selected.image, icons16_selected.w, icons16_selected.h, 0xffCACBD6, MixColors(col_selec, 0, 200));
//Libimg_LoadImage(#icons32_default, "/sys/icons32.png"); //Libimg_LoadImage(#icons32_default, "/sys/icons32.png");
//Libimg_LoadImage(#icons32_selected, "/sys/icons32.png"); //Libimg_LoadImage(#icons32_selected, "/sys/icons32.png");

8
programs/cmm/lib/kolibri.h
View File

@ -513,13 +513,13 @@ inline fastcall void PutPixel( EBX,ECX,EDX)
$int 0x40 $int 0x40
} }
void DefineButton(dword x,y,w,h,EDX,ESI) :void DefineButton(dword x,y,w,h,id,color)
{ {
EAX = 8; EAX = 8;
$push edx EDX = id + BT_DEL;
EDX += BT_DEL;
$int 0x40; $int 0x40;
$pop edx EDX = id;
ESI = color;
EBX = x<<16+w; EBX = x<<16+w;
ECX = y<<16+h; ECX = y<<16+h;
$int 0x40 $int 0x40