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

Pixie 1 & 2: use ac97snd as a backend, fix issue in ini.SetString(), remove minimp3 from autobuild

Browse Source 
git-svn-id: svn://kolibrios.org@7177 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2018-03-07 11:18:19 +00:00
parent 2253085d89
commit 94ede55e61
6 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/Tupfile.lua
View File

@ -55,7 +55,6 @@ img_files = {
{"MEDIA/PIXIE/PIXIE.INI", PROGS .. "/cmm/pixie/pixie.ini"},
{"MEDIA/PIXIE/S_DARK.PNG", PROGS .. "/cmm/pixie/s_dark.png"},
{"MEDIA/PIXIE/S_LIGHT.PNG", PROGS .. "/cmm/pixie/s_light.png"},
{"MEDIA/PIXIE/MINIMP3", PROGS .. "/cmm/pixie/minimp3"},
{"NETWORK/WV_SKIN.PNG", PROGS .. "/cmm/browser/wv_skin.png"},
{"NETWORK/FTPD.INI", "common/network/ftpd.ini"},
{"NETWORK/USERS.INI", "common/network/users.ini"},

2
programs/cmm/lib/obj/libini.h
View File

@ -71,7 +71,7 @@ void _ini::GetString(dword key, dst, len, default_value)
void _ini::SetString(dword key, value, len)
{
ini_set_str stdcall (key, value, len);
ini_set_str stdcall (path, section, key, value, len);
}
#endif

BIN
programs/cmm/pixie/minimp3
View File

Binary file not shown.

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

@ -20,7 +20,7 @@ od_filter filter2 = { 8, "MP3\0\0" };
#include "..\lib\patterns\libimg_load_skin.h"
#define ABOUT_MESSAGE "'Pixies Player v1.33\n\nOpen file: O key\nChange skin: F1/F2
#define ABOUT_MESSAGE "'Pixies Player v1.4\n\nOpen file: O key\nChange skin: F1/F2
Play/Stop: Space or P key\nStart playing selected file: Enter
Goto next/previous track: Ctrl + Left/Right
Change sound volume: Left/Right key\nMute: M key' -St\n"
@ -315,10 +315,10 @@ void StartPlayingMp3()
if (current_playing_file_n < 0) { current_playing_file_n = 0; return; }
playback_mode = PLAYBACK_MODE_PLAYING;
strlcpy(#current_filename, Getcur_yItemName(), sizeof(current_filename));
sprintf(#item_path,"\"%s/%s\"",#work_folder,#current_filename);
sprintf(#item_path,"-h %s/%s",#work_folder,#current_filename);
DrawPlayList();
DrawTopPanel();
if (strcmpi(#item_path+strlen(#item_path)-4,".mp3")) player_run_id = RunProgram(abspath("minimp3"), #item_path);
if (strcmpi(#item_path+strlen(#item_path)-3,".mp3")) player_run_id = RunProgram("/sys/media/ac97snd", #item_path);
sprintf(#notify_message,"'Now playing:\n%s' -St",#current_filename);
for (i=2; i<strlen(#notify_message)-6; i++) if (notify_message[i]=='\'') notify_message[i]=96; //replace ' char to avoid @notify misunderstood
notify_run_id = NotifyAndBackFocus(#notify_message);

BIN
programs/cmm/pixie2/minimp3
View File

Binary file not shown.

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

@ -34,7 +34,7 @@
char default_dir[] = "/rd/1";
od_filter filter2 = { 8, "MP3\0\0" };
#define ABOUT_MESSAGE "'Pixies Player v2.3
#define ABOUT_MESSAGE "'Pixies Player v2.4
A tiny MP3 folder player.
Controls:
@ -359,10 +359,10 @@ void EventStartPlayingMp3()
}
playback_mode = PLAYBACK_MODE_PLAYING;
strlcpy(#current_filename, Getcur_yItemName(), sizeof(current_filename));
sprintf(#item_path,"\"%s/%s\"",#work_folder,#current_filename);
sprintf(#item_path,"-h %s/%s",#work_folder,#current_filename);
DrawPlayList();
DrawTopPanel();
if (strcmpi(#item_path+strlen(#item_path)-4,".mp3")) player_run_id = RunProgram(abspath("minimp3"), #item_path);
if (strcmpi(#item_path+strlen(#item_path)-3,".mp3")) player_run_id = RunProgram("/sys/media/ac97snd", #item_path);
sprintf(#notify_message,"'Now playing:\n%s' -St",#current_filename);
for (i=2; i<strlen(#notify_message)-6; i++) if (notify_message[i]=='\'') notify_message[i]=96; //replace ' char to avoid @notify misunderstood
notify_run_id = notify(#notify_message);