From a3b41b5b37ca9c2fe7055c3de7caf759ce363e58 Mon Sep 17 00:00:00 2001
From: terencehill <piuntn@gmail.com>
Date: Wed, 16 May 2012 23:51:49 +0200
Subject: [PATCH] Add a real playlist where it's possible to add tracks from
the list of all the available tracks
---
qcsrc/menu/classes.c | 1 +
.../xonotic/dialog_multiplayer_musicplayer.c | 57 +++--
qcsrc/menu/xonotic/playlist.c | 214 ++++++++++++++++++
qcsrc/menu/xonotic/soundlist.c | 102 +--------
4 files changed, 260 insertions(+), 114 deletions(-)
create mode 100644 qcsrc/menu/xonotic/playlist.c
diff --git a/qcsrc/menu/classes.c b/qcsrc/menu/classes.c
index dfa7ebe7b5..40e90158b9 100644
--- a/qcsrc/menu/classes.c
+++ b/qcsrc/menu/classes.c
@@ -90,6 +90,7 @@
#include "xonotic/demolist.c"
#include "xonotic/dialog_multiplayer_musicplayer.c"
#include "xonotic/soundlist.c"
+#include "xonotic/playlist.c"
#include "xonotic/colorpicker.c"
#include "xonotic/colorpicker_string.c"
#include "xonotic/cvarlist.c"
diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_musicplayer.c b/qcsrc/menu/xonotic/dialog_multiplayer_musicplayer.c
index a1bbf8a006..a125b3b6dd 100644
--- a/qcsrc/menu/xonotic/dialog_multiplayer_musicplayer.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_musicplayer.c
@@ -22,11 +22,8 @@ void XonoticMusicPlayerTab_fill(entity me)
{
entity e;
entity btn;
- entity soundList;
+ entity soundList, playList;
- me.TR(me);
- me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "music_playlist_random0", _("Random order")));
- me.TR(me);
me.TR(me);
me.TD(me, 1, 0.5, e = makeXonoticTextLabel(0, _("Filter:")));
me.TD(me, 1, 0.5, btn = makeXonoticButton(_("Clear"), '0 0 0'));
@@ -37,32 +34,56 @@ void XonoticMusicPlayerTab_fill(entity me)
e.onChangeEntity = soundList;
btn.onClickEntity = e;
soundList.controlledTextbox = e;
+ playList = makeXonoticPlayList();
+ soundList.playlist = playList;
me.TR(me);
- me.TD(me, me.rows - 5, me.columns, soundList);
+ me.TD(me, 7, me.columns, soundList);
+
+ me.TR(me);
+ me.TR(me);
+ me.TR(me);
+ me.TR(me);
+ me.TR(me);
+ me.TR(me);
+ me.TR(me);
+ me.TD(me, 1, me.columns / 2, e = makeXonoticButton(_("Set selected as menu track"), '0 0 0'));
+ e.onClick = SoundList_Menu_Track_Change;
+ e.onClickEntity = soundList;
+ me.TD(me, 1, me.columns / 2, e = makeXonoticButton(_("Reset default menu track"), '0 0 0'));
+ e.onClick = SoundList_Menu_Track_Reset;
+ e.onClickEntity = soundList;
+ me.TR(me);
+ me.TR(me);
+ me.TR(me);
+ me.TD(me, 1, me.columns / 2, e = makeXonoticTextLabel(0, _("Playlist")));
+ me.TD(me, 1, me.columns / 2, e = makeXonoticCheckBox(0, "music_playlist_random0", _("Random order")));
+ me.TR(me);
+ me.TD(me, 9, me.columns, playList);
- me.gotoRC(me, me.rows - 2, 0);
+ me.TR(me);
+ me.TR(me);
+ me.TR(me);
+ me.TR(me);
+ me.TR(me);
+ me.TR(me);
+ me.TR(me);
+ me.TR(me);
+ me.gotoRC(me, me.rows - 1, 0);
me.TD(me, 1, me.columns / 5, e = makeXonoticButton(ZCTX(_("MP^Stop")), '0 0 0'));
e.onClick = StopSound_Click;
- e.onClickEntity = soundList;
+ e.onClickEntity = playList;
me.TD(me, 1, me.columns / 5, e = makeXonoticButton(ZCTX(_("MP^Play")), '0 0 0'));
e.onClick = StartSound_Click;
- e.onClickEntity = soundList;
+ e.onClickEntity = playList;
me.TD(me, 1, me.columns / 5, e = makeXonoticButton(ZCTX(_("MP^Pause/Play")), '0 0 0'));
e.onClick = PauseSound_Click;
- e.onClickEntity = soundList;
+ e.onClickEntity = playList;
me.TD(me, 1, me.columns / 5, e = makeXonoticButton(ZCTX(_("MP^Prev")), '0 0 0'));
e.onClick = PrevSound_Click;
- e.onClickEntity = soundList;
+ e.onClickEntity = playList;
me.TD(me, 1, me.columns / 5, e = makeXonoticButton(ZCTX(_("MP^Next")), '0 0 0'));
e.onClick = NextSound_Click;
- e.onClickEntity = soundList;
- me.TR(me);
- me.TD(me, 1, me.columns / 2, e = makeXonoticButton(_("Set selected as menu track"), '0 0 0'));
- e.onClick = SoundList_Menu_Track_Change;
- e.onClickEntity = soundList;
- me.TD(me, 1, me.columns / 2, e = makeXonoticButton(_("Reset default menu track"), '0 0 0'));
- e.onClick = SoundList_Menu_Track_Reset;
- e.onClickEntity = soundList;
+ e.onClickEntity = playList;
}
#endif
diff --git a/qcsrc/menu/xonotic/playlist.c b/qcsrc/menu/xonotic/playlist.c
new file mode 100644
index 0000000000..c9d1824d2a
--- /dev/null
+++ b/qcsrc/menu/xonotic/playlist.c
@@ -0,0 +1,214 @@
+#ifdef INTERFACE
+CLASS(XonoticPlayList) EXTENDS(XonoticListBox)
+ METHOD(XonoticPlayList, configureXonoticPlayList, void(entity))
+ ATTRIB(XonoticPlayList, rowsPerItem, float, 1)
+ METHOD(XonoticPlayList, resizeNotify, void(entity, vector, vector, vector, vector))
+ METHOD(XonoticPlayList, draw, void(entity))
+ METHOD(XonoticPlayList, drawListBoxItem, void(entity, float, vector, float))
+ METHOD(XonoticPlayList, stopSound, void(entity))
+ METHOD(XonoticPlayList, startSound, void(entity, float))
+ METHOD(XonoticPlayList, pauseSound, void(entity))
+ METHOD(XonoticPlayList, clickListBoxItem, void(entity, float, vector))
+ METHOD(XonoticPlayList, keyDown, float(entity, float, float, float))
+
+ METHOD(XonoticPlayList, addToPlayList, void(entity, string))
+ METHOD(XonoticPlayList, removeFromPlayList, void(entity, string))
+ ATTRIB(XonoticPlayList, playingTrack, string, string_null)
+
+ ATTRIB(XonoticPlayList, realFontSize, vector, '0 0 0')
+ ATTRIB(XonoticPlayList, columnNameOrigin, float, 0)
+ ATTRIB(XonoticPlayList, columnNameSize, float, 0)
+ ATTRIB(XonoticPlayList, realUpperMargin, float, 0)
+ ATTRIB(XonoticPlayList, origin, vector, '0 0 0')
+ ATTRIB(XonoticPlayList, itemAbsSize, vector, '0 0 0')
+
+ ATTRIB(XonoticPlayList, lastClickedSound, float, -1)
+ ATTRIB(XonoticPlayList, lastClickedTime, float, 0)
+ENDCLASS(XonoticPlayList)
+
+entity makeXonoticPlayList();
+void StopSound_Click(entity btn, entity me);
+void StartSound_Click(entity btn, entity me);
+void PauseSound_Click(entity btn, entity me);
+void PrevSound_Click(entity btn, entity me);
+void NextSound_Click(entity btn, entity me);
+#endif
+
+#ifdef IMPLEMENTATION
+
+entity makeXonoticPlayList()
+{
+ entity me;
+ me = spawnXonoticPlayList();
+ me.configureXonoticPlayList(me);
+ return me;
+}
+
+void XonoticPlayList_configureXonoticPlayList(entity me)
+{
+ me.nItems = tokenize_console(cvar_string("music_playlist_list0"));
+ me.configureXonoticListBox(me);
+}
+
+void XonoticPlayList_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
+{
+ me.itemAbsSize = '0 0 0';
+ SUPER(XonoticPlayList).resizeNotify(me, relOrigin, relSize, absOrigin, absSize);
+
+ me.realFontSize_y = me.fontSize / (me.itemAbsSize_y = (absSize_y * me.itemHeight));
+ me.realFontSize_x = me.fontSize / (me.itemAbsSize_x = (absSize_x * (1 - me.controlWidth)));
+ me.realUpperMargin = 0.5 * (1 - me.realFontSize_y);
+
+ me.columnNameOrigin = me.realFontSize_x;
+ me.columnNameSize = 1 - 2 * me.realFontSize_x;
+}
+
+void XonoticPlayList_addToPlayList(entity me, string track)
+{
+ // TODO: append instead of add
+ float old_nItems = me.nItems;
+ localcmd(strcat("\nmenu_cmd addtolist music_playlist_list0 ", track, "\n"));
+ me.nItems = tokenize_console(cvar_string("music_playlist_list0")); // FIXME: do this one frame later
+ if(me.nItems != old_nItems)
+ cvar_set("music_playlist_current0", ftos(cvar("music_playlist_current0") + 1));
+}
+
+void XonoticPlayList_removeFromPlayList(entity me, string track)
+{
+ float old_nItems = me.nItems;
+ localcmd(strcat("\nmenu_cmd removefromlist music_playlist_list0 ", track, "\n"));
+ me.nItems = tokenize_console(cvar_string("music_playlist_list0")); // FIXME: do this one frame later
+ if(me.nItems != old_nItems)
+ cvar_set("music_playlist_current0", ftos(cvar("music_playlist_current0") - 1));
+}
+
+void XonoticPlayList_draw(entity me)
+{
+ me.nItems = tokenize_console(cvar_string("music_playlist_list0"));
+ SUPER(XonoticPlayList).draw(me);
+}
+
+void XonoticPlayList_drawListBoxItem(entity me, float i, vector absSize, float isSelected)
+{
+ string s;
+ if(isSelected)
+ draw_Fill('0 0 0', '1 1 0', SKINCOLOR_LISTBOX_SELECTED, SKINALPHA_LISTBOX_SELECTED);
+
+ if(argv(i) == me.playingTrack)
+ {
+ float f = cvar("music_playlist_sampleposition0");
+ if(f == 0 || (((time * 2) & 1) && f > 0))
+ draw_Text(me.realUpperMargin * eY, chr(0xE000 + 141), me.realFontSize, '1 1 1', SKINALPHA_TEXT, 0);
+ }
+
+ s = argv(i);
+ s = strcat(ftos(i+1), ") ", s);
+ s = draw_TextShortenToWidth(s, me.columnNameSize, 0, me.realFontSize);
+ draw_Text(me.realUpperMargin * eY + me.columnNameOrigin * eX, s, me.realFontSize, '1 1 1', SKINALPHA_TEXT, 0);
+}
+
+void XonoticPlayList_stopSound(entity me)
+{
+ // STOP: list 0 is disabled by setting the index to -1
+ // we set sampleposition0 to -1 to indicate that music is stopped
+ if(cvar("music_playlist_index") != -1) // == 0 doesn't work when paused
+ {
+ cvar_set("music_playlist_index", "-1");
+ localcmd("\nwait; music_playlist_sampleposition0 -1\n");
+ localcmd("\ndefer 3 \"cd play $menu_cdtrack\"\n");
+ }
+}
+
+void StopSound_Click(entity btn, entity me)
+{
+ me.stopSound(me);
+}
+
+void XonoticPlayList_startSound(entity me, float offset)
+{
+ float f;
+ me.nItems = tokenize_console(cvar_string("music_playlist_list0"));
+ if(offset)
+ {
+ f = bound(0, cvar("music_playlist_current0") + offset, me.nItems - 1);
+ if(f == cvar("music_playlist_current0"))
+ return;
+ }
+ else
+ f = me.selectedItem;
+ if(me.playingTrack)
+ strunzone(me.playingTrack);
+ me.playingTrack = strzone(argv(f));
+ // START: list 0 is disabled by setting the index to 999
+ // we set current0 to the selected track and sampleposition0 to 0 to forget value saved by the engine
+ // then we switch back to list 0
+ cvar_set("music_playlist_index", "999");
+ cvar_set("music_playlist_current0", ftos(f));
+ localcmd("\nwait; music_playlist_sampleposition0 0; wait; music_playlist_index 0\n");
+}
+
+void StartSound_Click(entity btn, entity me)
+{
+ me.startSound(me, 0);
+}
+
+void PrevSound_Click(entity btn, entity me)
+{
+ me.startSound(me, -1);
+}
+
+void NextSound_Click(entity btn, entity me)
+{
+ me.startSound(me, +1);
+}
+
+void XonoticPlayList_pauseSound(entity me)
+{
+ // PAUSE: list 0 is disabled by setting the index to 999
+ // (we know the track is paused because the engine sets sampleposition0 to remember current position)
+ // RESUME: list 0 is enabled by setting the index to 0
+ // (we reset sampleposition0 to 0 to mark the track as in playing back state)
+ if(cvar("music_playlist_index") == 0)
+ localcmd("\nmusic_playlist_index 999\n");
+ else
+ localcmd("\nmusic_playlist_index 0; wait; music_playlist_sampleposition0 0\n");
+}
+
+void PauseSound_Click(entity btn, entity me)
+{
+ me.pauseSound(me);
+}
+
+void XonoticPlayList_clickListBoxItem(entity me, float i, vector where)
+{
+ if(i == me.lastClickedSound)
+ if(time < me.lastClickedTime + 0.3)
+ {
+ // DOUBLE CLICK!
+ me.setSelected(me, i);
+ me.startSound(me, 0);
+ }
+ me.lastClickedSound = i;
+ me.lastClickedTime = time;
+}
+
+float XonoticPlayList_keyDown(entity me, float scan, float ascii, float shift)
+{
+ if(scan == K_ENTER || scan == K_KP_ENTER) {
+ me.startSound(me, 0);
+ return 1;
+ }
+ else if(scan == K_SPACE) {
+ me.pauseSound(me);
+ return 1;
+ }
+ else if(scan == K_DEL || scan == K_KP_DEL || scan == K_BACKSPACE || scan == K_MOUSE3) {
+ me.nItems = tokenize_console(cvar_string("music_playlist_list0"));
+ me.removeFromPlayList(me, argv(me.selectedItem));
+ return 1;
+ }
+ else
+ return SUPER(XonoticPlayList).keyDown(me, scan, ascii, shift);
+}
+#endif
+
diff --git a/qcsrc/menu/xonotic/soundlist.c b/qcsrc/menu/xonotic/soundlist.c
index 17d53833c3..e488e9e35d 100644
--- a/qcsrc/menu/xonotic/soundlist.c
+++ b/qcsrc/menu/xonotic/soundlist.c
@@ -5,9 +5,6 @@ CLASS(XonoticSoundList) EXTENDS(XonoticListBox)
METHOD(XonoticSoundList, resizeNotify, void(entity, vector, vector, vector, vector))
METHOD(XonoticSoundList, drawListBoxItem, void(entity, float, vector, float))
METHOD(XonoticSoundList, getSounds, void(entity))
- METHOD(XonoticSoundList, stopSound, void(entity))
- METHOD(XonoticSoundList, startSound, void(entity, float))
- METHOD(XonoticSoundList, pauseSound, void(entity))
METHOD(XonoticSoundList, soundName, string(entity, float))
METHOD(XonoticSoundList, clickListBoxItem, void(entity, float, vector))
METHOD(XonoticSoundList, keyDown, float(entity, float, float, float))
@@ -25,14 +22,10 @@ CLASS(XonoticSoundList) EXTENDS(XonoticListBox)
ATTRIB(XonoticSoundList, lastClickedSound, float, -1)
ATTRIB(XonoticSoundList, lastClickedTime, float, 0)
ATTRIB(XonoticSoundList, filterString, string, string_null)
+ ATTRIB(XonoticSoundList, playlist, entity, world)
ENDCLASS(XonoticSoundList)
entity makeXonoticSoundList();
-void StopSound_Click(entity btn, entity me);
-void StartSound_Click(entity btn, entity me);
-void PauseSound_Click(entity btn, entity me);
-void PrevSound_Click(entity btn, entity me);
-void NextSound_Click(entity btn, entity me);
void SoundList_Filter_Change(entity box, entity me);
void SoundList_Menu_Track_Change(entity box, entity me);
void SoundList_Menu_Track_Reset(entity box, entity me);
@@ -83,13 +76,6 @@ void XonoticSoundList_getSounds(entity me)
me.nItems=0;
else
me.nItems=search_getsize(me.listSound);
-
- cvar_set("music_playlist_list0", "");
- s = "";
- for(i=0; i<me.nItems; ++i)
- {
- cvar_set("music_playlist_list0", strcat(cvar_string("music_playlist_list0"), me.soundName(me,i), " "));
- }
}
void XonoticSoundList_destroy(entity me)
@@ -116,19 +102,11 @@ void XonoticSoundList_drawListBoxItem(entity me, float i, vector absSize, float
if(isSelected)
draw_Fill('0 0 0', '1 1 0', SKINCOLOR_LISTBOX_SELECTED, SKINALPHA_LISTBOX_SELECTED);
- if(cvar("music_playlist_current0") == i)
- {
- float f = cvar("music_playlist_sampleposition0");
- if(f == 0 || (((time * 2) & 1) && f > 0))
- draw_Text(me.realUpperMargin * eY, chr(0xE000 + 141), me.realFontSize, '1 1 1', SKINALPHA_TEXT, 0);
- }
-
s = me.soundName(me,i);
if(s == cvar_defstring("menu_cdtrack"))
s = strcat(s, " [default menu track]");
else if(s == cvar_string("menu_cdtrack"))
s = strcat(s, " [current menu track]");
- s = strcat(ftos(i+1), ") ", s);
s = draw_TextShortenToWidth(s, me.columnNameSize, 0, me.realFontSize);
draw_Text(me.realUpperMargin * eY + me.columnNameOrigin * eX, s, me.realFontSize, '1 1 1', SKINALPHA_TEXT, 0);
}
@@ -161,74 +139,6 @@ void SoundList_Filter_Change(entity box, entity me)
me.getSounds(me);
}
-void XonoticSoundList_stopSound(entity me)
-{
- // STOP: list 0 is disabled by setting the index to -1
- // we set sampleposition0 to -1 to indicate that music is stopped
- if(cvar("music_playlist_index") != -1) // == 0 doesn't work when paused
- {
- cvar_set("music_playlist_index", "-1");
- localcmd("\nwait; music_playlist_sampleposition0 -1\n");
- localcmd("\ndefer 3 \"cd play $menu_cdtrack\"\n");
- }
-}
-
-void StopSound_Click(entity btn, entity me)
-{
- me.stopSound(me);
-}
-
-void XonoticSoundList_startSound(entity me, float offset)
-{
- float f;
- if(offset)
- {
- f = bound(0, cvar("music_playlist_current0") + offset, me.nItems - 1);
- if(f == cvar("music_playlist_current0"))
- return;
- }
- else
- f = me.selectedItem;
- // START: list 0 is disabled by setting the index to 999
- // we set current0 to the selected track and sampleposition0 to 0 to forget value saved by the engine
- // then we switch back to list 0
- cvar_set("music_playlist_index", "999");
- cvar_set("music_playlist_current0", ftos(f));
- localcmd("\nwait; music_playlist_sampleposition0 0; wait; music_playlist_index 0\n");
-}
-
-void StartSound_Click(entity btn, entity me)
-{
- me.startSound(me, 0);
-}
-
-void PrevSound_Click(entity btn, entity me)
-{
- me.startSound(me, -1);
-}
-
-void NextSound_Click(entity btn, entity me)
-{
- me.startSound(me, +1);
-}
-
-void XonoticSoundList_pauseSound(entity me)
-{
- // PAUSE: list 0 is disabled by setting the index to 999
- // (we know the track is paused because the engine sets sampleposition0 to remember current position)
- // RESUME: list 0 is enabled by setting the index to 0
- // (we reset sampleposition0 to 0 to mark the track as in playing back state)
- if(cvar("music_playlist_index") == 0)
- localcmd("\nmusic_playlist_index 999\n");
- else
- localcmd("\nmusic_playlist_index 0; wait; music_playlist_sampleposition0 0\n");
-}
-
-void PauseSound_Click(entity btn, entity me)
-{
- me.pauseSound(me);
-}
-
void XonoticSoundList_clickListBoxItem(entity me, float i, vector where)
{
if(i == me.lastClickedSound)
@@ -236,7 +146,7 @@ void XonoticSoundList_clickListBoxItem(entity me, float i, vector where)
{
// DOUBLE CLICK!
me.setSelected(me, i);
- me.startSound(me, 0);
+ me.playlist.addToPlayList(me.playlist, me.soundName(me, i));
}
me.lastClickedSound = i;
me.lastClickedTime = time;
@@ -244,12 +154,12 @@ void XonoticSoundList_clickListBoxItem(entity me, float i, vector where)
float XonoticSoundList_keyDown(entity me, float scan, float ascii, float shift)
{
- if(scan == K_ENTER || scan == K_KP_ENTER) {
- me.startSound(me, 0);
+ if(scan == K_ENTER || scan == K_KP_ENTER || scan == K_SPACE) {
+ me.playlist.addToPlayList(me.playlist, me.soundName(me, me.selectedItem));
return 1;
}
- else if(scan == K_SPACE) {
- me.pauseSound(me);
+ else if(scan == K_DEL || scan == K_KP_DEL) {
+ me.playlist.removeFromPlayList(me.playlist, me.soundName(me, me.selectedItem));
return 1;
}
else
--
2.39.5