WebSVN – mdb – Diff – /AMX/MDB/MDB_UI.axs

 	return '';
+}
 define_function displayProgresBar(char sTimeA[], char sTimeB[])
+{
-stack_var integer secA;
+stack_var double secA;
-stack_var integer secB;
+stack_var double secB;
 stack_var integer pos;
 stack_var integer hour;
 stack_var integer min;
 stack_var integer sec;
 	if (length_string(sTimeA) > 5)
+	{
 		hour = atoi(left_string(sTimeA, 2));
 		min = atoi(mid_string(sTimeA, 4, 2));
-		sec = atoi(mid_string(sTimeA, 7, 1));
+		sec = atoi(mid_string(sTimeA, 7, 2));
-		secA = hour * 3600 + min * 60 + sec;
+		secA = type_cast(hour * 3600 + min * 60 + sec);
+	}
 	else
+	{
 		min = atoi(mid_string(sTimeA, 1, 2));
-		sec = atoi(mid_string(sTimeA, 4, 1));
+		sec = atoi(mid_string(sTimeA, 4, 2));
-		secA = min * 60 + sec;
+		secA = type_cast(min * 60 + sec);
+	}
 	if (length_string(sTimeB) > 5)
+	{
 		hour = atoi(left_string(sTimeB, 2));
 		min = atoi(mid_string(sTimeB, 4, 2));
-		sec = atoi(mid_string(sTimeB, 7, 1));
+		sec = atoi(mid_string(sTimeB, 7, 2));
-		secB = hour * 3600 + min * 60 + sec;
+		secB = type_cast(hour * 3600 + min * 60 + sec);
+	}
 	else
+	{
 		min = atoi(mid_string(sTimeB, 1, 2));
-		sec = atoi(mid_string(sTimeB, 4, 1));
+		sec = atoi(mid_string(sTimeB, 4, 2));
-		secB = min * 60 + sec;
+		secB = type_cast(min * 60 + sec);
+	}
-	pos = type_cast(100.0 / type_cast(secB) * type_cast(secA));
+	pos = type_cast(100.0 / secB * secA);
 	send_level dvTPs, LVL_PROGRES, pos;
+}
 define_function setPopup(integer dir, char sPg[])
+{
 		case TOK_GENRE:
 			setPopup(DIR_OPEN, sPopupMenu);
 			send_command dvTPs, "'^TXT-',itoa(BTN_MENU1),'.',itoa(BTN_MENU1+MAX_LINES-1),',0,'";	// Clear all lines
 			send_command dvTPs, "'^TXT-',itoa(BTN_MENU1),',0,Move to queue and play'";
 			send_command dvTPs, "'^TXT-',itoa(BTN_MENU2),',0,Add to queue'";
+			if (nPage != TOK_TITLE)
-			send_command dvTPs, "'^TXT-',itoa(BTN_MENU3),',0,Open folder'";
+				send_command dvTPs, "'^TXT-',itoa(BTN_MENU3),',0,Open folder'";
 		break;
 		case TOK_PLAYLIST:
 			setPopup(DIR_OPEN, sPopupMenu);
 			send_command dvTPs, "'^TXT-',itoa(BTN_MENU1),'.',itoa(BTN_MENU1+MAX_LINES-1),',0,'";	// Clear all lines
 			send_command dvTPs, "'^TXT-',itoa(BTN_MENU1),',0,Move to queue and play'";
 			send_command dvTPs, "'^TXT-',itoa(BTN_MENU2),',0,Add to queue'";
 			if (!nFolder)
+			{
 				send_command dvTPs, "'^TXT-',itoa(BTN_MENU3),',0,Show content'";
+				send_command dvTPs, "'^TXT-',itoa(BTN_MENU4),',0,Delete playlist'";
+			}
 			else
-				send_command dvTPs, "'^TXT-',itoa(BTN_MENU3),',0,Delete playlist'";
+				send_command dvTPs, "'^TXT-',itoa(BTN_MENU3),',0,Delete entry'";
 		break;
 		case TOK_QUEUE:
 			setPopup(DIR_OPEN, sPopupMenu);
 			send_command dvTPs, "'^TXT-',itoa(BTN_MENU1),'.',itoa(BTN_MENU1+MAX_LINES-1),',0,'";	// Clear all lines
 		case TOK_PLAYLIST:	send_command dvTPs, "'^TXT-',itoa(TEXT_MENU_TITLE),',0,Playlist menu'";
 		case TOK_SEARCH:	send_command dvTPs, "'^TXT-',itoa(TEXT_MENU_TITLE),',0,Search menu'";
+	}
+}
+define_function lineSelect(integer pl)
+{
+	nLastPressedLine = pl;
+	askMenuList();
+}
 DEFINE_START
 	nStart = 1;
 	nPage = TOK_NONE;
 DEFINE_EVENT
 				case BTN_SAVE:
 					send_command dvTPs[pan], "'@PPN-',sPopupSelUser";
 					sInputUser = sActUser;
 					sInputPlaylist = '';
 					send_command dvTPs[pan], "'^TXT-',itoa(TEXT_INPUT_UNAME),',0,',sActUser";
-					send_command dvTPs[pan], "'^TXT-',itoa(TEXT_INPUT_UNAME),',0,'";
+					send_command dvTPs[pan], "'^TXT-',itoa(TEXT_INPUT_PLAYLIST),',0,'";
 					send_command dvTPs[pan], "'@AKB-',sActPlaylist,';Enter name of playlist'";
 					nToDo = TODO_USER_SAVE_PLAYLIST;
 					nKeyboard[pan] = TEXT_INPUT_PLAYLIST;
 				break;
 				case BTN_DELETE:
 					send_command vdvMDB, "'DELETE:QUEUE:-1;'";
+					nStart = 1;
+					send_command vdvMDB, "'LIST:QUEUE:',itoa(nStart),':',itoa(MAX_LINES),';'";
 				break;
 				case BTN_SEARCH:
 					if (!nSearch)
+					{
 				case MENU_THUMBS_UP:
 					if (nStart > MAX_LINES)
+					{
 						nStart = nStart - MAX_LINES;
-						if (nPage == TOK_TITLE || nPage == TOK_QUEUE || nPage == TOK_PLAYLIST)
+						if (nPage == TOK_TITLE || nPage == TOK_QUEUE)
 							send_command vdvMDB, "'LIST:',requestActualPage(),':',itoa(nStart),':',itoa(MAX_LINES),';'";
 						else if (nPage == TOK_SEARCH)
 							send_command vdvMDB, "'SEARCH:',requestPage(nOldPage),':',EncodeURL(sSearchFor),':',itoa(nStart),':',itoa(MAX_LINES),';'";
+						else if (nPage == TOK_PLAYLIST)
+						{
+							if (!nFolder)
+								send_command vdvMDB, "'LIST:',requestActualPage(),':',itoa(nStart),':',itoa(MAX_LINES),';'";
+							else
+								send_command vdvMDB, "'PLIST:',EncodeURL(sActUser),':',EncodeURL(sActPlaylist),':',itoa(nStart),':',itoa(MAX_LINES),';'";
+						}
 						else
+						{
+							if (!nFolder)
-							send_command vdvMDB, "'FOLDER:',requestActualPage(),':',itoa(nStart),':',itoa(MAX_LINES),';'";
+								send_command vdvMDB, "'FOLDER:',requestActualPage(),':',itoa(nStart),':',itoa(MAX_LINES),';'";
+							else
+								send_command vdvMDB, "'LISTFOLDER:',requestActualPage(),':',EncodeURL(sActFolder),':',itoa(nStart),':',itoa(MAX_LINES),';'";
+						}
+					}
 				break;
 				case MENU_THUMBS_DN:
 					if (nTotal && (nStart+MAX_LINES) <= nTotal)
+					{
 						nStart = nStart + MAX_LINES;
-						if (nPage == TOK_TITLE || nPage == TOK_QUEUE || nPage == TOK_PLAYLIST)
+						if (nPage == TOK_TITLE || nPage == TOK_QUEUE)
 							send_command vdvMDB, "'LIST:',requestActualPage(),':',itoa(nStart),':',itoa(MAX_LINES),';'";
 						else if (nPage == TOK_SEARCH)
 							send_command vdvMDB, "'SEARCH:',requestPage(nOldPage),':',EncodeURL(sSearchFor),':',itoa(nStart),':',itoa(MAX_LINES),';'";
+						else if (nPage == TOK_PLAYLIST)
+						{
+							if (!nFolder)
+								send_command vdvMDB, "'LIST:',requestActualPage(),':',itoa(nStart),':',itoa(MAX_LINES),';'";
+							else
+								send_command vdvMDB, "'PLIST:',EncodeURL(sActUser),':',EncodeURL(sActPlaylist),':',itoa(nStart),':',itoa(MAX_LINES),';'";
+						}
 						else
+						{
+							if (!nFolder)
-							send_command vdvMDB, "'FOLDER:',requestActualPage(),':',itoa(nStart),':',itoa(MAX_LINES),';'";
+								send_command vdvMDB, "'FOLDER:',requestActualPage(),':',itoa(nStart),':',itoa(MAX_LINES),';'";
+							else
+								send_command vdvMDB, "'LISTFOLDER:',requestActualPage(),':',EncodeURL(sActFolder),':',itoa(nStart),':',itoa(MAX_LINES),';'";
+						}
+					}
 				break;
 				case MENU_BACK:
 				case BTN_RETURN:
+		{
 			switch(BUTTON.INPUT.CHANNEL)
+			{
 				case BTN_LINE1_PIC:
 				case BTN_LINE1_LINE:
-					nLastPressedLine = 1;
-					askMenuList();
+					lineSelect(1);
 				break;
 				case BTN_LINE2_PIC:
 				case BTN_LINE2_LINE:
-					nLastPressedLine = 2;
-					askMenuList();
+					lineSelect(2);
 				break;
 				case BTN_LINE3_PIC:
 				case BTN_LINE3_LINE:
-					nLastPressedLine = 3;
-					askMenuList();
+					lineSelect(3);
 				break;
 				case BTN_LINE4_PIC:
 				case BTN_LINE4_LINE:
-					nLastPressedLine = 4;
-					askMenuList();
+					lineSelect(4);
 				break;
 				case BTN_LINE5_PIC:
 				case BTN_LINE5_LINE:
-					nLastPressedLine = 5;
-					askMenuList();
+					lineSelect(5);
 				break;
 				case BTN_LINE6_PIC:
 				case BTN_LINE6_LINE:
-					nLastPressedLine = 6;
-					askMenuList();
+					lineSelect(6);
 				break;
 				case BTN_LINE7_PIC:
 				case BTN_LINE7_LINE:
-					nLastPressedLine = 7;
-					askMenuList();
+					lineSelect(7);
 				break;
 				case BTN_LINE8_PIC:
 				case BTN_LINE8_LINE:
-					nLastPressedLine = 8;
-					askMenuList();
+					lineSelect(8);
 				break;
 				case BTN_LINE9_PIC:
 				case BTN_LINE9_LINE:
-					nLastPressedLine = 9;
-					askMenuList();
+					lineSelect(9);
 				break;
 				case BTN_LINE10_PIC:
 				case BTN_LINE10_LINE:
-					nLastPressedLine = 10;
-					askMenuList();
+					lineSelect(10);
 				break;
+			}
+		}
+	}
 						nKeyboard[pan] = TEXT_INPUT_PLAYLIST;
+					}
 				break;
 				case BTN_MENU3:
-					if (nPage != TOK_PLAYLIST && nPage != TOK_QUEUE && nPage != TOK_SEARCH)	// Open folder
+					if (nPage != TOK_TITLE && nPage != TOK_PLAYLIST && nPage != TOK_QUEUE && nPage != TOK_SEARCH)	// Open folder
+					{
 						sActFolder = stSong[nLastPressedLine].sTitle;	// Get name of folder
 						nFolder = true;									// Set marker for folder
 						nOldStart = nStart;								// Save current position
 						nStart = 1;										// Reset start position
 						send_command vdvMDB, "'LISTFOLDER:',requestActualPage(),':',stSong[nLastPressedLine].sTitle,':1:',itoa(MAX_LINES),';'";
+					}
 					else if (nPage == TOK_PLAYLIST)
+					{
+						if (!nFolder)
+						{
+							sActUser = sInputUser;
+							sActPlaylist = stSong[nLastPressedLine].sTitle;
-						nOldStart = nStart;
+							nOldStart = nStart;
-						nFolder = 1;
+							nFolder = 1;
+							nStart = 1;
+							send_command vdvMDB, "'PLIST:',EncodeURL(sActUser),':',EncodeURL(stSong[nLastPressedLine].sTitle),':',itoa(nStart),':',itoa(MAX_LINES),';'";
+						}
+						else		// Delete entry
+						{
+							send_command vdvMDB, "'DELETE:PTITLE:',itoa(stSong[nLastPressedLine].nID),';'";
-						nStart = 1;
+							nStart = 1;
-						send_command vdvMDB, "'PLIST:',EncodeURL(sActUser),':',EncodeURL(stSong[nLastPressedLine].sTitle),':',itoa(nStart),':',itoa(MAX_LINES),';'";
+							send_command vdvMDB, "'PLIST:',EncodeURL(sActUser),':',EncodeURL(stSong[nLastPressedLine].sTitle),':',itoa(nStart),':',itoa(MAX_LINES),';'";
+						}
+					}
 					else if (nPage == TOK_QUEUE)
+					{
 						send_command vdvMDB, "'DELETE:QUEUE:',itoa(stSong[nLastPressedLine].nID),';'";
+						nStart = 1;
+						send_command vdvMDB, "'LIST:QUEUE:',itoa(nStart),':',itoa(MAX_LINES),';'";
+					}
+				break;
+				case BTN_MENU4:
+					if (nPage == TOK_PLAYLIST && !nFolder)
+					{
+						send_command vdvMDB, "'DELETE:PLAYLIST:',itoa(stSong[nLastPressedLine].nID),';'";
+						nStart = 1;
+						send_command vdvMDB, "'LIST:PLAYLIST:',itoa(nStart),':',itoa(MAX_LINES),';'";
+					}
 				break;
+			}
 			if (nPage != TOK_QUEUE)
 				setPopup(DIR_OPEN, sPopupAudio);
 					switch(nToDo)
+					{
 						case TODO_USER_SELECT:
 							sActUser = sInputUser;
 							send_command vdvMDB, "'USER:',EncodeURL(sInputUser),':;'";
+							nStart = 1;
+							nPage = TOK_PLAYLIST;
+							nFolder = 0;
+							nSearch = 0;
+							send_command vdvMDB, "'LIST:PLAYLIST:',itoa(nStart),':',itoa(MAX_LINES),';'";
 						break;
 						case TODO_USER_LIST_PLAYLIST:
 							sActPlaylist = sInputPlaylist;
 							nOldStart = nStart;
 								send_command vdvMDB, "'SAVEQUEUE:',EncodeURL(sActUser),':',EncodeURL(sActPlaylist),';'";
 						break;
 						case TODO_USER_PLAYLIST_QUEUE:
 							sActUser = sInputUser;
-							sActPlaylist = sInputPlaylist;
+							sActPlaylist = stSong[nLastPressedLine].sTitle;
 							if (length_string(sActUser) && length_string(sActPlaylist))
-								send_command vdvMDB, "'ADD:PLAYLIST:',EncodeURL(sActPlaylist),';'";
+								send_command vdvMDB, "'ADD:PLAYLIST:',EncodeURL(stSong[nLastPressedLine].sTitle),';'";
 						break;
+					}
 					nToDo = 0;
 				break;
+					}
 					active(find_string(buf, 'PLAYLIST:', 1)):
+					{
 					stack_var integer nLine;
+					stack_var integer id;
 					stack_var integer anz;
 					stack_var integer i;
 						remove_string(buf, 'PLAYLIST:', 1);
 						anz = strtok(buf, ':');
 								case 1:
 									nLine = atoi(getStrTok(i));
 									clearPageLine(nLine);
 								break;
+								case 2: stSong[nLine].nID = atoi(getStrTok(i));
-								case 2: sActUser = DecodeURL(getStrTok(i));
+								case 3: sActUser = DecodeURL(getStrTok(i));
-								case 3: stSong[nLine].sTitle = DecodeURL(getStrTok(i));
+								case 4: stSong[nLine].sTitle = DecodeURL(getStrTok(i));
+							}
+						}
 						if (nLine == 1)
+						{
 					active(find_string(buf, 'TOTAL:', 1)):
+					{
 						remove_string(buf, 'TOTAL:', 1);
 						nTotal = atoi(buf);
 						displayPageInfo(nStart, nTotal);
+						if (nTotal == 0)
+							clearPage();
+					}
 					active(find_string(buf, 'PAGE:', 1)):
+					{
 						remove_string(buf, 'PAGE:', 1);

Subversion Repositories mdb

(root)/AMX/MDB/MDB_UI.axs – Rev 28 → 29