KolibriOS/kolibrios
12
4
Fork 12
Code Issues 78 Pull Requests 5 Projects Releases Activity

Pixie Player 1.2: control fixes

Browse Source 
git-svn-id: svn://kolibrios.org@5789 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2015-09-03 15:42:04 +00:00
parent a1e19e9f62
commit ce24ad0376
1 changed files with 36 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
programs/cmm/pixie/pixie.c
View File

@ -79,7 +79,6 @@ void main()
dword z1,z2; dword z1,z2;
mem_Init(); mem_Init();
SetEventMask(0x27);
load_dll(boxlib, #box_lib_init,0); load_dll(boxlib, #box_lib_init,0);
load_dll(libio, #libio_init,1); load_dll(libio, #libio_init,1);
load_dll(libimg, #libimg_init,1); load_dll(libimg, #libimg_init,1);
@ -101,6 +100,7 @@ void main()
} }
StartPlayingMp3(); StartPlayingMp3();
list.SetFont(6, 9, 10000000b);
list.SetSizes(1, skin.h, skin.w-1, 198, 18); list.SetSizes(1, skin.h, skin.w-1, 198, 18);
if (list.count <= list.visible) if (list.count <= list.visible)
{ {
@ -112,11 +112,10 @@ void main()
list.w -= scroll1.size_x; list.w -= scroll1.size_x;
} }
SetEventMask(0100111b);
loop() loop()
{ {
WaitEventTimeout(10); WaitEventTimeout(10);
//ActivateWindow(Form.ID);
switch(EAX & 0xFF) { switch(EAX & 0xFF) {
case evMouse: case evMouse:
if (!CheckActiveProcess(Form.ID)) break; if (!CheckActiveProcess(Form.ID)) break;
@ -128,16 +127,16 @@ void main()
DrawPlayList(); DrawPlayList();
break; break;
} }
if(mouse.down) if (list.MouseOver(mouse.x, mouse.y))
{ {
if (mouse.vert) if (list.MouseScroll(mouse.vert)) if (mouse.vert) if (list.MouseScroll(mouse.vert)) DrawPlayList();
{ if (mouse.dblclick) StartPlayingMp3();
DrawPlayList(); if (mouse.key&MOUSE_LEFT) if (list.ProcessMouse(mouse.x, mouse.y)) DrawPlayList();
if (mouse.key&MOUSE_RIGHT) notify("'Pixies Player v1.2\nChange sound volume: Left/Right key\nChange skin: F1/F2\nMute: M key' -St\n");
} }
if (list.MouseOver(mouse.x, mouse.y)) mouse_clicked = true;
else if(mouse.y < skin.h) && (mouse.x < 13)
{
//drag window - emulate windows header //drag window - emulate windows header
if(mouse.key&MOUSE_LEFT) && (mouse.y<skin.h) && (mouse.x < 13)
{
tmp_x = mouse.x; tmp_x = mouse.x;
tmp_y = mouse.y; tmp_y = mouse.y;
do { do {
@ -156,20 +155,8 @@ void main()
} }
pause(1); pause(1);
} while (mouse.lkm); } while (mouse.lkm);
if (mouse.pkm) && (mouse.y > skin.h)
notify("'Pixies Player v1.11\nChange sound volume: Left/Right key\nChange skin: F1/F2\nMute: M key' -St\n");
break;
}
else if(mouse.up)
{
if (mouse_clicked)&&(list.ProcessMouse(mouse.x, mouse.y))
{
StartPlayingMp3();
mouse_clicked = false;
} }
break; break;
}
}
case evButton: case evButton:
id=GetButtonID(); id=GetButtonID();
switch(id) { switch(id) {
@ -231,8 +218,8 @@ void main()
case evKey: case evKey:
GetKeys(); GetKeys();
if (key_scancode==003) SetColorThemeLight(); if (key_scancode==059) SetColorThemeLight();
if (key_scancode==004) SetColorThemeDark(); if (key_scancode==060) SetColorThemeDark();
if (key_scancode==SCAN_CODE_LEFT) RunProgram("@VOLUME", "-"); if (key_scancode==SCAN_CODE_LEFT) RunProgram("@VOLUME", "-");
if (key_scancode==SCAN_CODE_RIGHT) RunProgram("@VOLUME", "+"); if (key_scancode==SCAN_CODE_RIGHT) RunProgram("@VOLUME", "+");
if (key_scancode==050) RunProgram("@VOLUME", "m"); if (key_scancode==050) RunProgram("@VOLUME", "m");
@ -256,8 +243,8 @@ void main()
{ {
if (current_playing_file_n < list.count) if (current_playing_file_n < list.count)
{ {
current_playing_file_n = list.current; current_playing_file_n++;
if (list.KeyDown()) StartPlayingMp3(); StartPlayingMp3();
} }
else else
{ {
@ -315,6 +302,8 @@ void StopPlayingMp3()
if (player_run_id) player_run_id = KillProcess(player_run_id); if (player_run_id) player_run_id = KillProcess(player_run_id);
if (notify_run_id) notify_run_id = KillProcess(notify_run_id); if (notify_run_id) notify_run_id = KillProcess(notify_run_id);
playback_mode = PLAYBACK_MODE_STOPED; playback_mode = PLAYBACK_MODE_STOPED;
DrawTopPanel();
DrawPlayList();
} }