diff --git a/data/Tupfile.lua b/data/Tupfile.lua index c43236b078..54daafe5eb 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -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"}, diff --git a/programs/cmm/lib/obj/libini.h b/programs/cmm/lib/obj/libini.h index bc62faa2eb..49eeedf5f3 100644 --- a/programs/cmm/lib/obj/libini.h +++ b/programs/cmm/lib/obj/libini.h @@ -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 \ No newline at end of file diff --git a/programs/cmm/pixie/minimp3 b/programs/cmm/pixie/minimp3 deleted file mode 100644 index e76b106b46..0000000000 Binary files a/programs/cmm/pixie/minimp3 and /dev/null differ diff --git a/programs/cmm/pixie/pixie.c b/programs/cmm/pixie/pixie.c index ae0e2a4d18..198a5c2d59 100644 --- a/programs/cmm/pixie/pixie.c +++ b/programs/cmm/pixie/pixie.c @@ -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