From d3397f5fd83ae2b72549b5870178000ec6234e4b Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Thu, 15 Mar 2018 23:03:32 +0000 Subject: [PATCH] Pixie 2.61: remove extension, add WAV and XM support, update shuffle and repeat buttons skin git-svn-id: svn://kolibrios.org@7188 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/cmm/pixie2/get_files_list.h | 12 ++++++++---- programs/cmm/pixie2/pixie.c | 16 +++++++++------- programs/cmm/pixie2/skin.png | Bin 3876 -> 3855 bytes 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/programs/cmm/pixie2/get_files_list.h b/programs/cmm/pixie2/get_files_list.h index 19a774c814..3083ae4844 100644 --- a/programs/cmm/pixie2/get_files_list.h +++ b/programs/cmm/pixie2/get_files_list.h @@ -20,10 +20,14 @@ void OpenDirectory(dword folder_path) { strcpy(#temp_filename, j*304 + buf+72); end_pointer = #temp_filename+strlen(#temp_filename); - if (strcmpi(end_pointer-4,".mp3")!=0) continue; - cur = list.count; - files_mas[cur]=j; - list.count++; + if (strcmpi(end_pointer-4,".mp3")==0) + || (strcmpi(end_pointer-4,".wav")==0) + || (strcmpi(end_pointer-3,".xm")==0) + { + cur = list.count; + files_mas[cur]=j; + list.count++; + } } SortByName(0, list.count-1); } diff --git a/programs/cmm/pixie2/pixie.c b/programs/cmm/pixie2/pixie.c index 3cedb372f9..76448c6af3 100644 --- a/programs/cmm/pixie2/pixie.c +++ b/programs/cmm/pixie2/pixie.c @@ -36,8 +36,9 @@ char default_dir[] = "/rd/1"; od_filter filter2 = { 8, "MP3\0\0" }; -#define ABOUT_MESSAGE "'Pixies Player v2.6 -A tiny MP3 folder player. +#define ABOUT_MESSAGE "'Pixies Player v2.61 +A tiny music folder player. +Supports MP3, WAV, XM audio file formats. Controls: Open file: O key @@ -201,7 +202,7 @@ void DrawPlayList() for (i=0; i47) strcpy(#temp_filename+44, "..."); yyy = i*list.item_h+list.y; @@ -264,8 +265,8 @@ void DrawTopPanel() button_y = 46; 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 (repeat) img_draw stdcall(skin.image, Form.width - 108+8, button_y, 20, 20, skin.w+50, 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 (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 - 82-1, button_y+2, 17, 17, skin.w+62, WIN_H_SMALL+1); if /*(!list.count) && */ (!work_folder) DrawPixieTitle("Pixie"); 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 - 83, 1, 26, 15, BUTTON_WINDOW_REDUCE); //Other buttons - DefineHiddenButton(Form.width - 108,button_y, 23, 23, BUTTON_REPEAT); - DefineHiddenButton(Form.width - 81, button_y, 23, 23, BUTTON_SHUFFLE); + button_y += 3; + 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 - 27, button_y, 23, 23, BUTTON_SHOW_VOLUME); } diff --git a/programs/cmm/pixie2/skin.png b/programs/cmm/pixie2/skin.png index 31aee02800505ac93b3050be0649775b83eea2b9..b15757acdd10ac31a1adcad9824c5fa2b78c94cf 100644 GIT binary patch literal 3855 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 ZLofd5Pk2?%$M~}a40K`8%A5D2{sZE{hll_G