Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 7346 → Rev 7347

/programs/cmm/pixie2/get_files_list.h
15,7 → 15,6
{
notify("'Error opening folder' -E");
}
debugval("sizeof(files_mas)", sizeof(files_mas));
for (j=0; j<filesnum; j++)
{
strcpy(#temp_filename, j*304 + buf+72);
53,6 → 52,11
}
}
 
dword Getcur_yItemName() {
dword GetPlayingItemName() {
return files_mas[current_playing_file_n]*304 + buf+72;
}
 
dword GetSelectedItemName() {
int cury = list.cur_y;
return files_mas[cury]*304 + buf+72;
}
/programs/cmm/pixie2/pixie.c
30,7 → 30,7
char default_dir[] = "/rd/1";
od_filter filter2 = { 15, "MP3\0WAV\0XM\0\0" };
 
#define ABOUT_MESSAGE "Pixie Player v2.9 Final
#define ABOUT_MESSAGE "Pixie Player v2.91 Final
 
A tiny music folder player.
Supports MP3, WAV, XM audio file formats.
42,6 → 42,7
Goto next/previous track: Ctrl + Left/Right
Change sound volume: Left/Right key
Remove from the list: Delete
Permanently delete file: Shift + Delete
Repeat: R
Shuffle: S
Mute: M
170,6 → 171,10
if (key_scancode==SCAN_CODE_RIGHT) EventPlaybackNext();
break;
}
if (key_modifier&KEY_LSHIFT) || (key_modifier&KEY_RSHIFT) {
if (key_scancode==SCAN_CODE_DEL) EventPermanentlyDeleteFile();
break;
}
if (key_scancode==SCAN_CODE_KEY_O) EventFileDialogOpen();
if (key_scancode==SCAN_CODE_KEY_M) RunProgram("/sys/@VOLUME", "m");
if (key_scancode==SCAN_CODE_KEY_R) EventRepeatClick();
177,7 → 182,7
if (key_scancode==SCAN_CODE_RIGHT) RunProgram("/sys/@VOLUME", "+");
if (key_scancode==SCAN_CODE_LEFT) RunProgram("/sys/@VOLUME", "-");
if (key_scancode==SCAN_CODE_ENTER) EventStartPlayingSelectedItem();
if (key_scancode==SCAN_CODE_DEL) EventDeleteItem();
if (key_scancode==SCAN_CODE_DEL) EventRemoveItemFromList();
if (key_scancode==SCAN_CODE_KEY_P)||(key_scancode==SCAN_CODE_SPACE) EventPlayAndPause();
if (key_scancode==SCAN_CODE_F1) EventShowAbout();
if (list.ProcessKey(key_scancode)) DrawPlayList();
392,7 → 397,7
return;
}
playback_mode = PLAYBACK_MODE_PLAYING;
strlcpy(#current_filename, Getcur_yItemName(), sizeof(current_filename));
strlcpy(#current_filename, GetPlayingItemName(), sizeof(current_filename));
sprintf(#item_path,"-h %s/%s",#work_folder,#current_filename);
current_filename[strrchr(#current_filename, '.')-1] = '\0';
DrawPlayList();
500,7 → 505,7
DrawTopPanel();
}
 
void EventDeleteItem()
void EventRemoveItemFromList()
{
int i;
if (list.cur_y == current_playing_file_n) EventStopPlaying();
517,6 → 522,14
else DrawPlayList();
}
 
void EventPermanentlyDeleteFile()
{
char item_path[4096];
sprintf(#item_path,"%s/%s",#work_folder,GetSelectedItemName());
DeleteFile(#item_path);
EventRemoveItemFromList();
}
 
void EventShowAbout()
{
CreateThread(#ShowAboutThread,#menu_stak+4092);
535,7 → 548,7
if (key_scancode == SCAN_CODE_ESC) ExitProcess();
break;
case evReDraw:
DefineDragableWindow(150, 200, 400, 346);
DefineDragableWindow(150, 200, 400, 368);
GetProcessInfo(#pop_up, SelfInfo);
 
DrawBar(0, 0, pop_up.width, pop_up.height, theme.color_top_panel_bg);