annotate gui/util/list.c @ 35493:411875efca3f

Introduce boolean symbolic constants. Use them wherever suitable and useful to make code easier to read.
author ib
date Tue, 04 Dec 2012 18:36:14 +0000
parents 58a221f73d75
children e27855a45128
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
33741
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
1 /*
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
2 * This file is part of MPlayer.
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
3 *
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
4 * MPlayer is free software; you can redistribute it and/or modify
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
5 * it under the terms of the GNU General Public License as published by
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
6 * the Free Software Foundation; either version 2 of the License, or
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
7 * (at your option) any later version.
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
8 *
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
9 * MPlayer is distributed in the hope that it will be useful,
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
12 * GNU General Public License for more details.
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
13 *
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
14 * You should have received a copy of the GNU General Public License along
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
15 * with MPlayer; if not, write to the Free Software Foundation, Inc.,
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
17 */
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
18
34683
621058eff80f Add doxygen comments to list.c.
ib
parents: 34682
diff changeset
19 /**
621058eff80f Add doxygen comments to list.c.
ib
parents: 34682
diff changeset
20 * @file
621058eff80f Add doxygen comments to list.c.
ib
parents: 34682
diff changeset
21 * @brief List management
621058eff80f Add doxygen comments to list.c.
ib
parents: 34682
diff changeset
22 */
621058eff80f Add doxygen comments to list.c.
ib
parents: 34682
diff changeset
23
33741
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
24 #include <stdlib.h>
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
25 #include <string.h>
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
26
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
27 #include "list.h"
35493
411875efca3f Introduce boolean symbolic constants.
ib
parents: 35487
diff changeset
28 #include "gui/gui.h"
33741
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
29 #include "string.h"
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
30
35376
02006c5b3b30 Move add_to_gui_playlist() to util/list.c.
ib
parents: 34684
diff changeset
31 #include "mp_msg.h"
02006c5b3b30 Move add_to_gui_playlist() to util/list.c.
ib
parents: 34684
diff changeset
32 #include "path.h"
02006c5b3b30 Move add_to_gui_playlist() to util/list.c.
ib
parents: 34684
diff changeset
33
34667
7c447e9db447 Remove global variable pointing to top of playlist.
ib
parents: 34664
diff changeset
34 static plItem *plList;
34664
4df4d842d5fb Remove global variable pointing to current playlist item.
ib
parents: 34663
diff changeset
35 static plItem *plCurrent;
33742
e1539e14d60f Move purely list related parts of gtkSet() from interface.c to list.c.
ib
parents: 33741
diff changeset
36
34668
00e8aecfa7ff Remove global variable pointing to top of URL list.
ib
parents: 34667
diff changeset
37 static urlItem *urlList;
33742
e1539e14d60f Move purely list related parts of gtkSet() from interface.c to list.c.
ib
parents: 33741
diff changeset
38
34683
621058eff80f Add doxygen comments to list.c.
ib
parents: 34682
diff changeset
39 /**
621058eff80f Add doxygen comments to list.c.
ib
parents: 34682
diff changeset
40 * @brief Manage playlists and URL lists.
621058eff80f Add doxygen comments to list.c.
ib
parents: 34682
diff changeset
41 *
621058eff80f Add doxygen comments to list.c.
ib
parents: 34682
diff changeset
42 * @param cmd task to be performed
621058eff80f Add doxygen comments to list.c.
ib
parents: 34682
diff changeset
43 * @param data list item for the task
621058eff80f Add doxygen comments to list.c.
ib
parents: 34682
diff changeset
44 *
621058eff80f Add doxygen comments to list.c.
ib
parents: 34682
diff changeset
45 * @return pointer to top of list (GET command),
621058eff80f Add doxygen comments to list.c.
ib
parents: 34682
diff changeset
46 * pointer to current list item (ITEM command) or
621058eff80f Add doxygen comments to list.c.
ib
parents: 34682
diff changeset
47 * NULL (DELETE or unknown command)
621058eff80f Add doxygen comments to list.c.
ib
parents: 34682
diff changeset
48 *
35487
58a221f73d75 Enhance PLAYLIST_ITEM_GET_POS to provide total number of items.
ib
parents: 35460
diff changeset
49 * @note PLAYLIST_ITEM_GET_POS returns the position number as pointer
58a221f73d75 Enhance PLAYLIST_ITEM_GET_POS to provide total number of items.
ib
parents: 35460
diff changeset
50 * (if @a data is NULL the last position number, i.e. number of items),
35458
2a6113c08e20 Add listMgr command PLAYLIST_ITEM_GET_CURR_POS.
ib
parents: 35386
diff changeset
51 * and position 0 means "not found"
34683
621058eff80f Add doxygen comments to list.c.
ib
parents: 34682
diff changeset
52 */
34610
4ff933a89818 Cosmetic: Rename functions in list.c.
ib
parents: 34602
diff changeset
53 void *listMgr(int cmd, void *data)
33742
e1539e14d60f Move purely list related parts of gtkSet() from interface.c to list.c.
ib
parents: 33741
diff changeset
54 {
35458
2a6113c08e20 Add listMgr command PLAYLIST_ITEM_GET_CURR_POS.
ib
parents: 35386
diff changeset
55 unsigned int pos;
34673
ea1df3e51d3f Cosmetic: Rename variables in listMgr().
ib
parents: 34670
diff changeset
56 plItem *pdat = (plItem *)data;
ea1df3e51d3f Cosmetic: Rename variables in listMgr().
ib
parents: 34670
diff changeset
57 urlItem *udat = (urlItem *)data;
33742
e1539e14d60f Move purely list related parts of gtkSet() from interface.c to list.c.
ib
parents: 33741
diff changeset
58
e1539e14d60f Move purely list related parts of gtkSet() from interface.c to list.c.
ib
parents: 33741
diff changeset
59 switch (cmd) {
34684
b03481253518 Cosmetic: Prefer C style for single line comments.
ib
parents: 34683
diff changeset
60 /* playlist */
33742
e1539e14d60f Move purely list related parts of gtkSet() from interface.c to list.c.
ib
parents: 33741
diff changeset
61
34667
7c447e9db447 Remove global variable pointing to top of playlist.
ib
parents: 34664
diff changeset
62 case PLAYLIST_GET:
7c447e9db447 Remove global variable pointing to top of playlist.
ib
parents: 34664
diff changeset
63
7c447e9db447 Remove global variable pointing to top of playlist.
ib
parents: 34664
diff changeset
64 return plList;
7c447e9db447 Remove global variable pointing to top of playlist.
ib
parents: 34664
diff changeset
65
34681
42fa91951bd2 Rename PLAYLIST_ITEM_ADD PLAYLIST_ITEM_APPEND.
ib
parents: 34680
diff changeset
66 case PLAYLIST_ITEM_APPEND:
34674
a99f159b137d Revise listMgr() command PLAYLIST_ITEM_ADD.
ib
parents: 34673
diff changeset
67
33742
e1539e14d60f Move purely list related parts of gtkSet() from interface.c to list.c.
ib
parents: 33741
diff changeset
68 if (plList) {
34673
ea1df3e51d3f Cosmetic: Rename variables in listMgr().
ib
parents: 34670
diff changeset
69 plItem *item = plList;
33742
e1539e14d60f Move purely list related parts of gtkSet() from interface.c to list.c.
ib
parents: 33741
diff changeset
70
34673
ea1df3e51d3f Cosmetic: Rename variables in listMgr().
ib
parents: 34670
diff changeset
71 while (item->next)
ea1df3e51d3f Cosmetic: Rename variables in listMgr().
ib
parents: 34670
diff changeset
72 item = item->next;
33742
e1539e14d60f Move purely list related parts of gtkSet() from interface.c to list.c.
ib
parents: 33741
diff changeset
73
34673
ea1df3e51d3f Cosmetic: Rename variables in listMgr().
ib
parents: 34670
diff changeset
74 item->next = pdat;
ea1df3e51d3f Cosmetic: Rename variables in listMgr().
ib
parents: 34670
diff changeset
75 pdat->prev = item;
ea1df3e51d3f Cosmetic: Rename variables in listMgr().
ib
parents: 34670
diff changeset
76 pdat->next = NULL;
33742
e1539e14d60f Move purely list related parts of gtkSet() from interface.c to list.c.
ib
parents: 33741
diff changeset
77 } else {
34674
a99f159b137d Revise listMgr() command PLAYLIST_ITEM_ADD.
ib
parents: 34673
diff changeset
78 pdat->next = pdat->prev = NULL;
34673
ea1df3e51d3f Cosmetic: Rename variables in listMgr().
ib
parents: 34670
diff changeset
79 plCurrent = plList = pdat;
33742
e1539e14d60f Move purely list related parts of gtkSet() from interface.c to list.c.
ib
parents: 33741
diff changeset
80 }
34674
a99f159b137d Revise listMgr() command PLAYLIST_ITEM_ADD.
ib
parents: 34673
diff changeset
81
a99f159b137d Revise listMgr() command PLAYLIST_ITEM_ADD.
ib
parents: 34673
diff changeset
82 return plCurrent;
33742
e1539e14d60f Move purely list related parts of gtkSet() from interface.c to list.c.
ib
parents: 33741
diff changeset
83
34663
73a5ecb53ee2 Replace symbolic constants by enums.
ib
parents: 34627
diff changeset
84 case PLAYLIST_ITEM_INSERT:
34675
45b2c7bbec60 Revise listMgr() command PLAYLIST_ITEM_INSERT.
ib
parents: 34674
diff changeset
85
33742
e1539e14d60f Move purely list related parts of gtkSet() from interface.c to list.c.
ib
parents: 33741
diff changeset
86 if (plCurrent) {
34675
45b2c7bbec60 Revise listMgr() command PLAYLIST_ITEM_INSERT.
ib
parents: 34674
diff changeset
87 pdat->next = plCurrent->next;
33742
e1539e14d60f Move purely list related parts of gtkSet() from interface.c to list.c.
ib
parents: 33741
diff changeset
88
34673
ea1df3e51d3f Cosmetic: Rename variables in listMgr().
ib
parents: 34670
diff changeset
89 if (pdat->next)
ea1df3e51d3f Cosmetic: Rename variables in listMgr().
ib
parents: 34670
diff changeset
90 pdat->next->prev = pdat;
33742
e1539e14d60f Move purely list related parts of gtkSet() from interface.c to list.c.
ib
parents: 33741
diff changeset
91
34675
45b2c7bbec60 Revise listMgr() command PLAYLIST_ITEM_INSERT.
ib
parents: 34674
diff changeset
92 pdat->prev = plCurrent;
45b2c7bbec60 Revise listMgr() command PLAYLIST_ITEM_INSERT.
ib
parents: 34674
diff changeset
93 plCurrent->next = pdat;
45b2c7bbec60 Revise listMgr() command PLAYLIST_ITEM_INSERT.
ib
parents: 34674
diff changeset
94
45b2c7bbec60 Revise listMgr() command PLAYLIST_ITEM_INSERT.
ib
parents: 34674
diff changeset
95 plCurrent = pdat;
33742
e1539e14d60f Move purely list related parts of gtkSet() from interface.c to list.c.
ib
parents: 33741
diff changeset
96
e1539e14d60f Move purely list related parts of gtkSet() from interface.c to list.c.
ib
parents: 33741
diff changeset
97 return plCurrent;
e1539e14d60f Move purely list related parts of gtkSet() from interface.c to list.c.
ib
parents: 33741
diff changeset
98 } else
34681
42fa91951bd2 Rename PLAYLIST_ITEM_ADD PLAYLIST_ITEM_APPEND.
ib
parents: 34680
diff changeset
99 return listMgr(PLAYLIST_ITEM_APPEND, pdat);
33742
e1539e14d60f Move purely list related parts of gtkSet() from interface.c to list.c.
ib
parents: 33741
diff changeset
100
35460
7d1d7f783975 Add listMgr command PLAYLIST_ITEM_FIND.
ib
parents: 35458
diff changeset
101 case PLAYLIST_ITEM_FIND:
7d1d7f783975 Add listMgr command PLAYLIST_ITEM_FIND.
ib
parents: 35458
diff changeset
102
7d1d7f783975 Add listMgr command PLAYLIST_ITEM_FIND.
ib
parents: 35458
diff changeset
103 if (plList) {
7d1d7f783975 Add listMgr command PLAYLIST_ITEM_FIND.
ib
parents: 35458
diff changeset
104 plItem *item = plList;
7d1d7f783975 Add listMgr command PLAYLIST_ITEM_FIND.
ib
parents: 35458
diff changeset
105
7d1d7f783975 Add listMgr command PLAYLIST_ITEM_FIND.
ib
parents: 35458
diff changeset
106 do {
7d1d7f783975 Add listMgr command PLAYLIST_ITEM_FIND.
ib
parents: 35458
diff changeset
107 if (gstrcmp(item->path, pdat->path) == 0 && gstrcmp(item->name, pdat->name) == 0)
7d1d7f783975 Add listMgr command PLAYLIST_ITEM_FIND.
ib
parents: 35458
diff changeset
108 return item;
7d1d7f783975 Add listMgr command PLAYLIST_ITEM_FIND.
ib
parents: 35458
diff changeset
109
7d1d7f783975 Add listMgr command PLAYLIST_ITEM_FIND.
ib
parents: 35458
diff changeset
110 item = item->next;
7d1d7f783975 Add listMgr command PLAYLIST_ITEM_FIND.
ib
parents: 35458
diff changeset
111 } while (item);
7d1d7f783975 Add listMgr command PLAYLIST_ITEM_FIND.
ib
parents: 35458
diff changeset
112 }
7d1d7f783975 Add listMgr command PLAYLIST_ITEM_FIND.
ib
parents: 35458
diff changeset
113
7d1d7f783975 Add listMgr command PLAYLIST_ITEM_FIND.
ib
parents: 35458
diff changeset
114 return NULL;
7d1d7f783975 Add listMgr command PLAYLIST_ITEM_FIND.
ib
parents: 35458
diff changeset
115
34682
c3ab7bd64ab3 Cosmetic: Arrange listMgr() commands in switch statement.
ib
parents: 34681
diff changeset
116 case PLAYLIST_ITEM_SET_CURR:
34676
207272df4aef Cosmetic: Insert some blank lines and remove commented code.
ib
parents: 34675
diff changeset
117
34682
c3ab7bd64ab3 Cosmetic: Arrange listMgr() commands in switch statement.
ib
parents: 34681
diff changeset
118 plCurrent = pdat;
c3ab7bd64ab3 Cosmetic: Arrange listMgr() commands in switch statement.
ib
parents: 34681
diff changeset
119 return plCurrent;
34676
207272df4aef Cosmetic: Insert some blank lines and remove commented code.
ib
parents: 34675
diff changeset
120
34682
c3ab7bd64ab3 Cosmetic: Arrange listMgr() commands in switch statement.
ib
parents: 34681
diff changeset
121 case PLAYLIST_ITEM_GET_CURR:
c3ab7bd64ab3 Cosmetic: Arrange listMgr() commands in switch statement.
ib
parents: 34681
diff changeset
122
c3ab7bd64ab3 Cosmetic: Arrange listMgr() commands in switch statement.
ib
parents: 34681
diff changeset
123 return plCurrent;
33742
e1539e14d60f Move purely list related parts of gtkSet() from interface.c to list.c.
ib
parents: 33741
diff changeset
124
35458
2a6113c08e20 Add listMgr command PLAYLIST_ITEM_GET_CURR_POS.
ib
parents: 35386
diff changeset
125 case PLAYLIST_ITEM_GET_POS:
2a6113c08e20 Add listMgr command PLAYLIST_ITEM_GET_CURR_POS.
ib
parents: 35386
diff changeset
126
2a6113c08e20 Add listMgr command PLAYLIST_ITEM_GET_CURR_POS.
ib
parents: 35386
diff changeset
127 pos = 0;
2a6113c08e20 Add listMgr command PLAYLIST_ITEM_GET_CURR_POS.
ib
parents: 35386
diff changeset
128
2a6113c08e20 Add listMgr command PLAYLIST_ITEM_GET_CURR_POS.
ib
parents: 35386
diff changeset
129 if (plList) {
2a6113c08e20 Add listMgr command PLAYLIST_ITEM_GET_CURR_POS.
ib
parents: 35386
diff changeset
130 unsigned int i = 0;
2a6113c08e20 Add listMgr command PLAYLIST_ITEM_GET_CURR_POS.
ib
parents: 35386
diff changeset
131 plItem *item = plList;
2a6113c08e20 Add listMgr command PLAYLIST_ITEM_GET_CURR_POS.
ib
parents: 35386
diff changeset
132
2a6113c08e20 Add listMgr command PLAYLIST_ITEM_GET_CURR_POS.
ib
parents: 35386
diff changeset
133 do {
2a6113c08e20 Add listMgr command PLAYLIST_ITEM_GET_CURR_POS.
ib
parents: 35386
diff changeset
134 i++;
2a6113c08e20 Add listMgr command PLAYLIST_ITEM_GET_CURR_POS.
ib
parents: 35386
diff changeset
135
2a6113c08e20 Add listMgr command PLAYLIST_ITEM_GET_CURR_POS.
ib
parents: 35386
diff changeset
136 if (item == pdat) {
2a6113c08e20 Add listMgr command PLAYLIST_ITEM_GET_CURR_POS.
ib
parents: 35386
diff changeset
137 pos = i;
2a6113c08e20 Add listMgr command PLAYLIST_ITEM_GET_CURR_POS.
ib
parents: 35386
diff changeset
138 break;
2a6113c08e20 Add listMgr command PLAYLIST_ITEM_GET_CURR_POS.
ib
parents: 35386
diff changeset
139 }
2a6113c08e20 Add listMgr command PLAYLIST_ITEM_GET_CURR_POS.
ib
parents: 35386
diff changeset
140
2a6113c08e20 Add listMgr command PLAYLIST_ITEM_GET_CURR_POS.
ib
parents: 35386
diff changeset
141 item = item->next;
2a6113c08e20 Add listMgr command PLAYLIST_ITEM_GET_CURR_POS.
ib
parents: 35386
diff changeset
142 } while (item);
35487
58a221f73d75 Enhance PLAYLIST_ITEM_GET_POS to provide total number of items.
ib
parents: 35460
diff changeset
143
58a221f73d75 Enhance PLAYLIST_ITEM_GET_POS to provide total number of items.
ib
parents: 35460
diff changeset
144 if (!pdat)
58a221f73d75 Enhance PLAYLIST_ITEM_GET_POS to provide total number of items.
ib
parents: 35460
diff changeset
145 pos = i;
35458
2a6113c08e20 Add listMgr command PLAYLIST_ITEM_GET_CURR_POS.
ib
parents: 35386
diff changeset
146 }
2a6113c08e20 Add listMgr command PLAYLIST_ITEM_GET_CURR_POS.
ib
parents: 35386
diff changeset
147
2a6113c08e20 Add listMgr command PLAYLIST_ITEM_GET_CURR_POS.
ib
parents: 35386
diff changeset
148 return (void *)pos;
2a6113c08e20 Add listMgr command PLAYLIST_ITEM_GET_CURR_POS.
ib
parents: 35386
diff changeset
149
34663
73a5ecb53ee2 Replace symbolic constants by enums.
ib
parents: 34627
diff changeset
150 case PLAYLIST_ITEM_GET_PREV:
34676
207272df4aef Cosmetic: Insert some blank lines and remove commented code.
ib
parents: 34675
diff changeset
151
33742
e1539e14d60f Move purely list related parts of gtkSet() from interface.c to list.c.
ib
parents: 33741
diff changeset
152 if (plCurrent && plCurrent->prev) {
e1539e14d60f Move purely list related parts of gtkSet() from interface.c to list.c.
ib
parents: 33741
diff changeset
153 plCurrent = plCurrent->prev;
e1539e14d60f Move purely list related parts of gtkSet() from interface.c to list.c.
ib
parents: 33741
diff changeset
154 return plCurrent;
e1539e14d60f Move purely list related parts of gtkSet() from interface.c to list.c.
ib
parents: 33741
diff changeset
155 }
34676
207272df4aef Cosmetic: Insert some blank lines and remove commented code.
ib
parents: 34675
diff changeset
156
33742
e1539e14d60f Move purely list related parts of gtkSet() from interface.c to list.c.
ib
parents: 33741
diff changeset
157 return NULL;
e1539e14d60f Move purely list related parts of gtkSet() from interface.c to list.c.
ib
parents: 33741
diff changeset
158
34682
c3ab7bd64ab3 Cosmetic: Arrange listMgr() commands in switch statement.
ib
parents: 34681
diff changeset
159 case PLAYLIST_ITEM_GET_NEXT:
34676
207272df4aef Cosmetic: Insert some blank lines and remove commented code.
ib
parents: 34675
diff changeset
160
34682
c3ab7bd64ab3 Cosmetic: Arrange listMgr() commands in switch statement.
ib
parents: 34681
diff changeset
161 if (plCurrent && plCurrent->next) {
c3ab7bd64ab3 Cosmetic: Arrange listMgr() commands in switch statement.
ib
parents: 34681
diff changeset
162 plCurrent = plCurrent->next;
c3ab7bd64ab3 Cosmetic: Arrange listMgr() commands in switch statement.
ib
parents: 34681
diff changeset
163 return plCurrent;
c3ab7bd64ab3 Cosmetic: Arrange listMgr() commands in switch statement.
ib
parents: 34681
diff changeset
164 }
33742
e1539e14d60f Move purely list related parts of gtkSet() from interface.c to list.c.
ib
parents: 33741
diff changeset
165
34682
c3ab7bd64ab3 Cosmetic: Arrange listMgr() commands in switch statement.
ib
parents: 34681
diff changeset
166 return NULL;
33742
e1539e14d60f Move purely list related parts of gtkSet() from interface.c to list.c.
ib
parents: 33741
diff changeset
167
34663
73a5ecb53ee2 Replace symbolic constants by enums.
ib
parents: 34627
diff changeset
168 case PLAYLIST_ITEM_DEL_CURR:
34677
d3f65dd58eb9 Revise listMgr() command PLAYLIST_ITEM_DEL_CURR.
ib
parents: 34676
diff changeset
169
d3f65dd58eb9 Revise listMgr() command PLAYLIST_ITEM_DEL_CURR.
ib
parents: 34676
diff changeset
170 if (plCurrent) {
34678
23f4f2104774 Cosmetic: Adjust indent.
ib
parents: 34677
diff changeset
171 plItem *curr = plCurrent;
33742
e1539e14d60f Move purely list related parts of gtkSet() from interface.c to list.c.
ib
parents: 33741
diff changeset
172
34678
23f4f2104774 Cosmetic: Adjust indent.
ib
parents: 34677
diff changeset
173 if (curr->prev)
23f4f2104774 Cosmetic: Adjust indent.
ib
parents: 34677
diff changeset
174 curr->prev->next = curr->next;
23f4f2104774 Cosmetic: Adjust indent.
ib
parents: 34677
diff changeset
175 if (curr->next)
23f4f2104774 Cosmetic: Adjust indent.
ib
parents: 34677
diff changeset
176 curr->next->prev = curr->prev;
33742
e1539e14d60f Move purely list related parts of gtkSet() from interface.c to list.c.
ib
parents: 33741
diff changeset
177
34678
23f4f2104774 Cosmetic: Adjust indent.
ib
parents: 34677
diff changeset
178 plCurrent = curr->next;
33742
e1539e14d60f Move purely list related parts of gtkSet() from interface.c to list.c.
ib
parents: 33741
diff changeset
179
34678
23f4f2104774 Cosmetic: Adjust indent.
ib
parents: 34677
diff changeset
180 if (curr == plList)
23f4f2104774 Cosmetic: Adjust indent.
ib
parents: 34677
diff changeset
181 plList = plCurrent;
34677
d3f65dd58eb9 Revise listMgr() command PLAYLIST_ITEM_DEL_CURR.
ib
parents: 34676
diff changeset
182
34678
23f4f2104774 Cosmetic: Adjust indent.
ib
parents: 34677
diff changeset
183 free(curr->path);
23f4f2104774 Cosmetic: Adjust indent.
ib
parents: 34677
diff changeset
184 free(curr->name);
23f4f2104774 Cosmetic: Adjust indent.
ib
parents: 34677
diff changeset
185 free(curr);
23f4f2104774 Cosmetic: Adjust indent.
ib
parents: 34677
diff changeset
186 }
34677
d3f65dd58eb9 Revise listMgr() command PLAYLIST_ITEM_DEL_CURR.
ib
parents: 34676
diff changeset
187
33742
e1539e14d60f Move purely list related parts of gtkSet() from interface.c to list.c.
ib
parents: 33741
diff changeset
188 return plCurrent;
e1539e14d60f Move purely list related parts of gtkSet() from interface.c to list.c.
ib
parents: 33741
diff changeset
189
34663
73a5ecb53ee2 Replace symbolic constants by enums.
ib
parents: 34627
diff changeset
190 case PLAYLIST_DELETE:
34676
207272df4aef Cosmetic: Insert some blank lines and remove commented code.
ib
parents: 34675
diff changeset
191
34602
a5d0652dd1a0 Fix bug in freeing playlist items.
ib
parents: 34601
diff changeset
192 while (plList) {
34673
ea1df3e51d3f Cosmetic: Rename variables in listMgr().
ib
parents: 34670
diff changeset
193 plItem *item = plList->next;
33742
e1539e14d60f Move purely list related parts of gtkSet() from interface.c to list.c.
ib
parents: 33741
diff changeset
194
34602
a5d0652dd1a0 Fix bug in freeing playlist items.
ib
parents: 34601
diff changeset
195 free(plList->path);
a5d0652dd1a0 Fix bug in freeing playlist items.
ib
parents: 34601
diff changeset
196 free(plList->name);
a5d0652dd1a0 Fix bug in freeing playlist items.
ib
parents: 34601
diff changeset
197 free(plList);
a5d0652dd1a0 Fix bug in freeing playlist items.
ib
parents: 34601
diff changeset
198
34673
ea1df3e51d3f Cosmetic: Rename variables in listMgr().
ib
parents: 34670
diff changeset
199 plList = item;
33742
e1539e14d60f Move purely list related parts of gtkSet() from interface.c to list.c.
ib
parents: 33741
diff changeset
200 }
34676
207272df4aef Cosmetic: Insert some blank lines and remove commented code.
ib
parents: 34675
diff changeset
201
33742
e1539e14d60f Move purely list related parts of gtkSet() from interface.c to list.c.
ib
parents: 33741
diff changeset
202 plCurrent = NULL;
e1539e14d60f Move purely list related parts of gtkSet() from interface.c to list.c.
ib
parents: 33741
diff changeset
203 return NULL;
e1539e14d60f Move purely list related parts of gtkSet() from interface.c to list.c.
ib
parents: 33741
diff changeset
204
34684
b03481253518 Cosmetic: Prefer C style for single line comments.
ib
parents: 34683
diff changeset
205 /* URL list */
34668
00e8aecfa7ff Remove global variable pointing to top of URL list.
ib
parents: 34667
diff changeset
206
00e8aecfa7ff Remove global variable pointing to top of URL list.
ib
parents: 34667
diff changeset
207 case URLLIST_GET:
00e8aecfa7ff Remove global variable pointing to top of URL list.
ib
parents: 34667
diff changeset
208
00e8aecfa7ff Remove global variable pointing to top of URL list.
ib
parents: 34667
diff changeset
209 return urlList;
00e8aecfa7ff Remove global variable pointing to top of URL list.
ib
parents: 34667
diff changeset
210
34663
73a5ecb53ee2 Replace symbolic constants by enums.
ib
parents: 34627
diff changeset
211 case URLLIST_ITEM_ADD:
34679
6378e3a2ffb8 Revise listMgr() command URLLIST_ITEM_ADD.
ib
parents: 34678
diff changeset
212
33748
5860cfaff0a4 Cosmetic: Rename URLList urlList.
ib
parents: 33742
diff changeset
213 if (urlList) {
34673
ea1df3e51d3f Cosmetic: Rename variables in listMgr().
ib
parents: 34670
diff changeset
214 urlItem *item = urlList;
33742
e1539e14d60f Move purely list related parts of gtkSet() from interface.c to list.c.
ib
parents: 33741
diff changeset
215
34679
6378e3a2ffb8 Revise listMgr() command URLLIST_ITEM_ADD.
ib
parents: 34678
diff changeset
216 while (item) {
6378e3a2ffb8 Revise listMgr() command URLLIST_ITEM_ADD.
ib
parents: 34678
diff changeset
217 if (strcmp(udat->url, item->url) == 0) {
6378e3a2ffb8 Revise listMgr() command URLLIST_ITEM_ADD.
ib
parents: 34678
diff changeset
218 free(udat->url);
6378e3a2ffb8 Revise listMgr() command URLLIST_ITEM_ADD.
ib
parents: 34678
diff changeset
219 free(udat);
6378e3a2ffb8 Revise listMgr() command URLLIST_ITEM_ADD.
ib
parents: 34678
diff changeset
220 return NULL;
6378e3a2ffb8 Revise listMgr() command URLLIST_ITEM_ADD.
ib
parents: 34678
diff changeset
221 }
6378e3a2ffb8 Revise listMgr() command URLLIST_ITEM_ADD.
ib
parents: 34678
diff changeset
222
6378e3a2ffb8 Revise listMgr() command URLLIST_ITEM_ADD.
ib
parents: 34678
diff changeset
223 if (item->next)
6378e3a2ffb8 Revise listMgr() command URLLIST_ITEM_ADD.
ib
parents: 34678
diff changeset
224 item = item->next;
6378e3a2ffb8 Revise listMgr() command URLLIST_ITEM_ADD.
ib
parents: 34678
diff changeset
225 else {
6378e3a2ffb8 Revise listMgr() command URLLIST_ITEM_ADD.
ib
parents: 34678
diff changeset
226 item->next = udat;
6378e3a2ffb8 Revise listMgr() command URLLIST_ITEM_ADD.
ib
parents: 34678
diff changeset
227 udat->next = NULL;
33742
e1539e14d60f Move purely list related parts of gtkSet() from interface.c to list.c.
ib
parents: 33741
diff changeset
228 break;
e1539e14d60f Move purely list related parts of gtkSet() from interface.c to list.c.
ib
parents: 33741
diff changeset
229 }
e1539e14d60f Move purely list related parts of gtkSet() from interface.c to list.c.
ib
parents: 33741
diff changeset
230 }
e1539e14d60f Move purely list related parts of gtkSet() from interface.c to list.c.
ib
parents: 33741
diff changeset
231 } else {
34673
ea1df3e51d3f Cosmetic: Rename variables in listMgr().
ib
parents: 34670
diff changeset
232 udat->next = NULL;
ea1df3e51d3f Cosmetic: Rename variables in listMgr().
ib
parents: 34670
diff changeset
233 urlList = udat;
33742
e1539e14d60f Move purely list related parts of gtkSet() from interface.c to list.c.
ib
parents: 33741
diff changeset
234 }
34679
6378e3a2ffb8 Revise listMgr() command URLLIST_ITEM_ADD.
ib
parents: 34678
diff changeset
235
6378e3a2ffb8 Revise listMgr() command URLLIST_ITEM_ADD.
ib
parents: 34678
diff changeset
236 return udat;
34599
80246b016caf Add code to free the URL list items.
ib
parents: 33748
diff changeset
237
34663
73a5ecb53ee2 Replace symbolic constants by enums.
ib
parents: 34627
diff changeset
238 case URLLIST_DELETE:
34676
207272df4aef Cosmetic: Insert some blank lines and remove commented code.
ib
parents: 34675
diff changeset
239
34599
80246b016caf Add code to free the URL list items.
ib
parents: 33748
diff changeset
240 while (urlList) {
34673
ea1df3e51d3f Cosmetic: Rename variables in listMgr().
ib
parents: 34670
diff changeset
241 urlItem *item = urlList->next;
34601
f9b7f4b48fcb Fix bug in freeing URL list items.
ib
parents: 34599
diff changeset
242
34599
80246b016caf Add code to free the URL list items.
ib
parents: 33748
diff changeset
243 free(urlList->url);
34601
f9b7f4b48fcb Fix bug in freeing URL list items.
ib
parents: 34599
diff changeset
244 free(urlList);
f9b7f4b48fcb Fix bug in freeing URL list items.
ib
parents: 34599
diff changeset
245
34673
ea1df3e51d3f Cosmetic: Rename variables in listMgr().
ib
parents: 34670
diff changeset
246 urlList = item;
34599
80246b016caf Add code to free the URL list items.
ib
parents: 33748
diff changeset
247 }
34676
207272df4aef Cosmetic: Insert some blank lines and remove commented code.
ib
parents: 34675
diff changeset
248
34599
80246b016caf Add code to free the URL list items.
ib
parents: 33748
diff changeset
249 return NULL;
34680
f49f6501eb8b Add a default clause to listMgr()'s switch statement.
ib
parents: 34679
diff changeset
250
f49f6501eb8b Add a default clause to listMgr()'s switch statement.
ib
parents: 34679
diff changeset
251 default:
33742
e1539e14d60f Move purely list related parts of gtkSet() from interface.c to list.c.
ib
parents: 33741
diff changeset
252
34680
f49f6501eb8b Add a default clause to listMgr()'s switch statement.
ib
parents: 34679
diff changeset
253 return NULL;
f49f6501eb8b Add a default clause to listMgr()'s switch statement.
ib
parents: 34679
diff changeset
254 }
33742
e1539e14d60f Move purely list related parts of gtkSet() from interface.c to list.c.
ib
parents: 33741
diff changeset
255 }
e1539e14d60f Move purely list related parts of gtkSet() from interface.c to list.c.
ib
parents: 33741
diff changeset
256
33741
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
257 /**
34622
e96ee4cac59f Revise listSet().
ib
parents: 34610
diff changeset
258 * @brief Set list to @a entry.
e96ee4cac59f Revise listSet().
ib
parents: 34610
diff changeset
259 *
e96ee4cac59f Revise listSet().
ib
parents: 34610
diff changeset
260 * @param list pointer to the char pointer list
e96ee4cac59f Revise listSet().
ib
parents: 34610
diff changeset
261 * @param entry the new (and only) element of the list
e96ee4cac59f Revise listSet().
ib
parents: 34610
diff changeset
262 *
e96ee4cac59f Revise listSet().
ib
parents: 34610
diff changeset
263 * @note Actually, a new list will be created and the old list will be freed.
33741
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
264 */
34610
4ff933a89818 Cosmetic: Rename functions in list.c.
ib
parents: 34602
diff changeset
265 void listSet(char ***list, const char *entry)
33741
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
266 {
34622
e96ee4cac59f Revise listSet().
ib
parents: 34610
diff changeset
267 if (*list) {
e96ee4cac59f Revise listSet().
ib
parents: 34610
diff changeset
268 char **l = *list;
33741
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
269
34622
e96ee4cac59f Revise listSet().
ib
parents: 34610
diff changeset
270 while (*l) {
e96ee4cac59f Revise listSet().
ib
parents: 34610
diff changeset
271 free(*l);
e96ee4cac59f Revise listSet().
ib
parents: 34610
diff changeset
272 l++;
e96ee4cac59f Revise listSet().
ib
parents: 34610
diff changeset
273 }
33741
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
274
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
275 free(*list);
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
276 }
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
277
34623
f8b848c178e5 Cosmetic: Adjust indent.
ib
parents: 34622
diff changeset
278 *list = malloc(2 * sizeof(char *));
34622
e96ee4cac59f Revise listSet().
ib
parents: 34610
diff changeset
279
e96ee4cac59f Revise listSet().
ib
parents: 34610
diff changeset
280 if (*list) {
34623
f8b848c178e5 Cosmetic: Adjust indent.
ib
parents: 34622
diff changeset
281 (*list)[0] = gstrdup(entry);
f8b848c178e5 Cosmetic: Adjust indent.
ib
parents: 34622
diff changeset
282 (*list)[1] = NULL;
34622
e96ee4cac59f Revise listSet().
ib
parents: 34610
diff changeset
283 }
33741
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
284 }
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
285
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
286 /**
34627
3482045da618 Revise listRepl().
ib
parents: 34623
diff changeset
287 * @brief Replace the first element in list that starts with @a search.
3482045da618 Revise listRepl().
ib
parents: 34623
diff changeset
288 *
3482045da618 Revise listRepl().
ib
parents: 34623
diff changeset
289 * @note If no such element is found, @a replace will be appended.
3482045da618 Revise listRepl().
ib
parents: 34623
diff changeset
290 *
3482045da618 Revise listRepl().
ib
parents: 34623
diff changeset
291 * @param list pointer to the char pointer list
3482045da618 Revise listRepl().
ib
parents: 34623
diff changeset
292 * @param search element to search
3482045da618 Revise listRepl().
ib
parents: 34623
diff changeset
293 * @param replace replacement element
33741
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
294 */
34610
4ff933a89818 Cosmetic: Rename functions in list.c.
ib
parents: 34602
diff changeset
295 void listRepl(char ***list, const char *search, const char *replace)
33741
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
296 {
34627
3482045da618 Revise listRepl().
ib
parents: 34623
diff changeset
297 int i = 0;
3482045da618 Revise listRepl().
ib
parents: 34623
diff changeset
298 char **org = *list;
3482045da618 Revise listRepl().
ib
parents: 34623
diff changeset
299
3482045da618 Revise listRepl().
ib
parents: 34623
diff changeset
300 if (!replace)
3482045da618 Revise listRepl().
ib
parents: 34623
diff changeset
301 return;
33741
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
302
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
303 if (*list) {
34627
3482045da618 Revise listRepl().
ib
parents: 34623
diff changeset
304 size_t len = (search ? strlen(search) : 0);
3482045da618 Revise listRepl().
ib
parents: 34623
diff changeset
305
33741
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
306 for (i = 0; (*list)[i]; i++) {
34627
3482045da618 Revise listRepl().
ib
parents: 34623
diff changeset
307 if (gstrncmp((*list)[i], search, len) == 0) {
33741
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
308 free((*list)[i]);
34627
3482045da618 Revise listRepl().
ib
parents: 34623
diff changeset
309 (*list)[i] = strdup(replace);
33741
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
310 return;
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
311 }
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
312 }
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
313
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
314 *list = realloc(*list, (i + 2) * sizeof(char *));
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
315 } else
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
316 *list = malloc(2 * sizeof(char *));
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
317
34627
3482045da618 Revise listRepl().
ib
parents: 34623
diff changeset
318 if (!*list) {
3482045da618 Revise listRepl().
ib
parents: 34623
diff changeset
319 *list = org;
3482045da618 Revise listRepl().
ib
parents: 34623
diff changeset
320 return;
3482045da618 Revise listRepl().
ib
parents: 34623
diff changeset
321 }
3482045da618 Revise listRepl().
ib
parents: 34623
diff changeset
322
3482045da618 Revise listRepl().
ib
parents: 34623
diff changeset
323 (*list)[i] = strdup(replace);
33741
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
324 (*list)[i + 1] = NULL;
962dc701989d Create new file list.c for list related functions.
ib
parents:
diff changeset
325 }
35376
02006c5b3b30 Move add_to_gui_playlist() to util/list.c.
ib
parents: 34684
diff changeset
326
02006c5b3b30 Move add_to_gui_playlist() to util/list.c.
ib
parents: 34684
diff changeset
327 /**
02006c5b3b30 Move add_to_gui_playlist() to util/list.c.
ib
parents: 34684
diff changeset
328 * @brief Append or insert a file to the playlist.
02006c5b3b30 Move add_to_gui_playlist() to util/list.c.
ib
parents: 34684
diff changeset
329 *
02006c5b3b30 Move add_to_gui_playlist() to util/list.c.
ib
parents: 34684
diff changeset
330 * @param what file to be added
02006c5b3b30 Move add_to_gui_playlist() to util/list.c.
ib
parents: 34684
diff changeset
331 * @param how command (#PLAYLIST_ITEM_APPEND or #PLAYLIST_ITEM_INSERT) to be performed
02006c5b3b30 Move add_to_gui_playlist() to util/list.c.
ib
parents: 34684
diff changeset
332 *
35493
411875efca3f Introduce boolean symbolic constants.
ib
parents: 35487
diff changeset
333 * @return #True (ok) or #False (error)
35376
02006c5b3b30 Move add_to_gui_playlist() to util/list.c.
ib
parents: 34684
diff changeset
334 */
02006c5b3b30 Move add_to_gui_playlist() to util/list.c.
ib
parents: 34684
diff changeset
335 int add_to_gui_playlist(const char *what, int how)
02006c5b3b30 Move add_to_gui_playlist() to util/list.c.
ib
parents: 34684
diff changeset
336 {
35378
e900dc6b8d66 Improve add_to_gui_playlist().
ib
parents: 35376
diff changeset
337 const char *file;
e900dc6b8d66 Improve add_to_gui_playlist().
ib
parents: 35376
diff changeset
338 char *path;
35376
02006c5b3b30 Move add_to_gui_playlist() to util/list.c.
ib
parents: 34684
diff changeset
339 plItem *item;
02006c5b3b30 Move add_to_gui_playlist() to util/list.c.
ib
parents: 34684
diff changeset
340
35386
ef2d3b306d6e Check for a non-empty filename.
ib
parents: 35378
diff changeset
341 if (!what || !*what || (how != PLAYLIST_ITEM_APPEND && how != PLAYLIST_ITEM_INSERT))
35493
411875efca3f Introduce boolean symbolic constants.
ib
parents: 35487
diff changeset
342 return False;
35376
02006c5b3b30 Move add_to_gui_playlist() to util/list.c.
ib
parents: 34684
diff changeset
343
35378
e900dc6b8d66 Improve add_to_gui_playlist().
ib
parents: 35376
diff changeset
344 file = mp_basename(what);
e900dc6b8d66 Improve add_to_gui_playlist().
ib
parents: 35376
diff changeset
345 path = strdup(what);
35376
02006c5b3b30 Move add_to_gui_playlist() to util/list.c.
ib
parents: 34684
diff changeset
346
35378
e900dc6b8d66 Improve add_to_gui_playlist().
ib
parents: 35376
diff changeset
347 if (file > what)
e900dc6b8d66 Improve add_to_gui_playlist().
ib
parents: 35376
diff changeset
348 path[file - what - 1] = 0;
35376
02006c5b3b30 Move add_to_gui_playlist() to util/list.c.
ib
parents: 34684
diff changeset
349 else
35378
e900dc6b8d66 Improve add_to_gui_playlist().
ib
parents: 35376
diff changeset
350 strcpy(path, ".");
35376
02006c5b3b30 Move add_to_gui_playlist() to util/list.c.
ib
parents: 34684
diff changeset
351
02006c5b3b30 Move add_to_gui_playlist() to util/list.c.
ib
parents: 34684
diff changeset
352 item = calloc(1, sizeof(plItem));
02006c5b3b30 Move add_to_gui_playlist() to util/list.c.
ib
parents: 34684
diff changeset
353
02006c5b3b30 Move add_to_gui_playlist() to util/list.c.
ib
parents: 34684
diff changeset
354 if (!item)
35493
411875efca3f Introduce boolean symbolic constants.
ib
parents: 35487
diff changeset
355 return False;
35376
02006c5b3b30 Move add_to_gui_playlist() to util/list.c.
ib
parents: 34684
diff changeset
356
35378
e900dc6b8d66 Improve add_to_gui_playlist().
ib
parents: 35376
diff changeset
357 mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[list] adding %s/%s\n", path, file);
35376
02006c5b3b30 Move add_to_gui_playlist() to util/list.c.
ib
parents: 34684
diff changeset
358
35378
e900dc6b8d66 Improve add_to_gui_playlist().
ib
parents: 35376
diff changeset
359 item->name = strdup(file);
e900dc6b8d66 Improve add_to_gui_playlist().
ib
parents: 35376
diff changeset
360 item->path = path;
35376
02006c5b3b30 Move add_to_gui_playlist() to util/list.c.
ib
parents: 34684
diff changeset
361
02006c5b3b30 Move add_to_gui_playlist() to util/list.c.
ib
parents: 34684
diff changeset
362 listMgr(how, item);
02006c5b3b30 Move add_to_gui_playlist() to util/list.c.
ib
parents: 34684
diff changeset
363
35493
411875efca3f Introduce boolean symbolic constants.
ib
parents: 35487
diff changeset
364 return True;
35376
02006c5b3b30 Move add_to_gui_playlist() to util/list.c.
ib
parents: 34684
diff changeset
365 }