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

Pixie 2.61: remove extension, add WAV and XM support, update shuffle and repeat buttons skin

Browse Source 
git-svn-id: svn://kolibrios.org@7188 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2018-03-15 23:03:32 +00:00
parent 5a44396d79
commit d3397f5fd8
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
programs/cmm/pixie2/get_files_list.h
View File

@ -20,11 +20,15 @@ void OpenDirectory(dword folder_path)
{ {
strcpy(#temp_filename, j*304 + buf+72); strcpy(#temp_filename, j*304 + buf+72);
end_pointer = #temp_filename+strlen(#temp_filename); end_pointer = #temp_filename+strlen(#temp_filename);
if (strcmpi(end_pointer-4,".mp3")!=0) continue; if (strcmpi(end_pointer-4,".mp3")==0)
|| (strcmpi(end_pointer-4,".wav")==0)
|| (strcmpi(end_pointer-3,".xm")==0)
{
cur = list.count; cur = list.count;
files_mas[cur]=j; files_mas[cur]=j;
list.count++; list.count++;
} }
}
SortByName(0, list.count-1); SortByName(0, list.count-1);
} }

16
programs/cmm/pixie2/pixie.c
View File

@ -36,8 +36,9 @@
char default_dir[] = "/rd/1"; char default_dir[] = "/rd/1";
od_filter filter2 = { 8, "MP3\0\0" }; od_filter filter2 = { 8, "MP3\0\0" };
#define ABOUT_MESSAGE "'Pixies Player v2.6 #define ABOUT_MESSAGE "'Pixies Player v2.61
A tiny MP3 folder player. A tiny music folder player.
Supports MP3, WAV, XM audio file formats.
Controls: Controls:
Open file: O key Open file: O key
@ -201,7 +202,7 @@ void DrawPlayList()
for (i=0; i<list.visible; i++;) for (i=0; i<list.visible; i++;)
{ {
strcpy(#temp_filename, files_mas[i + list.first] * 304 + buf + 72); strcpy(#temp_filename, files_mas[i + list.first] * 304 + buf + 72);
//temp_filename[strlen(#temp_filename)-4] = '\0'; temp_filename[strrchr(#temp_filename, '.')-1] = '\0';
//if (strlen(#temp_filename)>47) strcpy(#temp_filename+44, "..."); //if (strlen(#temp_filename)>47) strcpy(#temp_filename+44, "...");
yyy = i*list.item_h+list.y; yyy = i*list.item_h+list.y;
@ -264,8 +265,8 @@ void DrawTopPanel()
button_y = 46; button_y = 46;
img_draw stdcall(skin.image, 0, 0, skin.w, skin.h, 0, 0); img_draw stdcall(skin.image, 0, 0, skin.w, skin.h, 0, 0);
if (playback_mode != PLAYBACK_MODE_STOPED) img_draw stdcall(skin.image, 46, button_y, 41, 21, skin.w+1, WIN_H_SMALL+1); if (playback_mode != PLAYBACK_MODE_STOPED) img_draw stdcall(skin.image, 46, button_y, 41, 21, skin.w+1, WIN_H_SMALL+1);
if (repeat) img_draw stdcall(skin.image, Form.width - 108+8, button_y, 20, 20, skin.w+50, WIN_H_SMALL+1); if (repeat) img_draw stdcall(skin.image, Form.width - 101-1, button_y+2, 17, 17, skin.w+43, WIN_H_SMALL+1);
if (shuffle) img_draw stdcall(skin.image, Form.width - 81+5, button_y, 20, 20, skin.w+75, WIN_H_SMALL+1); if (shuffle) img_draw stdcall(skin.image, Form.width - 82-1, button_y+2, 17, 17, skin.w+62, WIN_H_SMALL+1);
if /*(!list.count) && */ (!work_folder) DrawPixieTitle("Pixie"); if /*(!list.count) && */ (!work_folder) DrawPixieTitle("Pixie");
else DrawPixieTitle(#work_folder + strrchr(#work_folder, '/')); else DrawPixieTitle(#work_folder + strrchr(#work_folder, '/'));
@ -279,8 +280,9 @@ void DrawTopPanel()
DefineHiddenButton(Form.width - 55, 1, 26, 15, BUTTON_WINDOW_MINIMIZE); DefineHiddenButton(Form.width - 55, 1, 26, 15, BUTTON_WINDOW_MINIMIZE);
DefineHiddenButton(Form.width - 83, 1, 26, 15, BUTTON_WINDOW_REDUCE); DefineHiddenButton(Form.width - 83, 1, 26, 15, BUTTON_WINDOW_REDUCE);
//Other buttons //Other buttons
DefineHiddenButton(Form.width - 108,button_y, 23, 23, BUTTON_REPEAT); button_y += 3;
DefineHiddenButton(Form.width - 81, button_y, 23, 23, BUTTON_SHUFFLE); DefineHiddenButton(Form.width - 101,button_y, 17, 16, BUTTON_REPEAT);
DefineHiddenButton(Form.width - 82, button_y, 17, 16, BUTTON_SHUFFLE);
DefineHiddenButton(Form.width - 54, button_y, 23, 23, BUTTON_OPEN_DIALOG); DefineHiddenButton(Form.width - 54, button_y, 23, 23, BUTTON_OPEN_DIALOG);
DefineHiddenButton(Form.width - 27, button_y, 23, 23, BUTTON_SHOW_VOLUME); DefineHiddenButton(Form.width - 27, button_y, 23, 23, BUTTON_SHOW_VOLUME);
} }

BIN
programs/cmm/pixie2/skin.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB