[Toxine-cvs] CVS: toxine/src commands.c,1.19,1.20 common.h,1.5,1.6 main.c,1.8,1.9 playlist.c,1.2,1.3
Brought to you by:
f1rmb
Menu
▾
▴
[Toxine-cvs] CVS: toxine/src commands.c,1.19,1.20 common.h,1.5,1.6 main.c,1.8,1.9 playlist.c,1.2,1.3 playlist.h,1.1,1.2 utils.c,1.4,1.5 xine_commands.c,1.9,1.10
|
From: Daniel Caujolle-B. <f1...@us...> - 2002-07-18 22:19:33
|
Update of /cvsroot/toxine/toxine/src
In directory usw-pr-cvs1:/tmp/cvs-serv5825/src
Modified Files:
commands.c common.h main.c playlist.c playlist.h utils.c
xine_commands.c
Log Message:
Playlist switch from char** to new mediamark_t** data type. mediamark stuff is
under construction and not implemented yet.
Index: commands.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/commands.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- commands.c 16 Jul 2002 09:15:28 -0000 1.19
+++ commands.c 18 Jul 2002 22:19:30 -0000 1.20
@@ -123,6 +123,7 @@
static void do_events(commands_t *, toxine_t *, void *);
static void do_playlist(commands_t *, toxine_t *, void *);
static void do_display(commands_t *, toxine_t *, void *);
+static void do_mediamk(commands_t *, toxine_t *, void *);
static commands_t commands[] = {
{ "commands", NO_ARGS, do_help,
@@ -285,7 +286,7 @@
"playlist add <mrl> ...\n"
"playlist from <plugin>\n"
"playlist delete # ...\n"
- "playlist delete all\n"
+ "playlist delete [all | *]\n"
"playlist load <filename>\n"
"playlist save <filename>\n"
"playlist loop [[yes | no | 1 | 0 | true | false] | [status]]"
@@ -296,6 +297,10 @@
"display current time\n"
"display settings"
},
+ { "mediamark", REQUIRE_ARGS, do_mediamk,
+ "mediamark",
+ "NOTHING YET"
+ },
{ "version", NO_ARGS, do_version,
"Display some version informations",
"version"
@@ -1423,11 +1428,13 @@
for(i = 0; i < tox->playlist.num; i++) {
poutalign();
if(tox->playlist.cur == i) {
- pout("*%4d: '%s'\n", i, tox->playlist.entries[i]);
+ pout("*%4d: '%s' ", i, tox->playlist.mmk[i]->mrl);
}
else {
- pout(" %4d: '%s'\n", i, tox->playlist.entries[i]);
+ pout(" %4d: '%s' ", i, tox->playlist.mmk[i]->mrl);
}
+ pout("[%d .. %d]\n", tox->playlist.mmk[i]->start, tox->playlist.mmk[i]->end);
+
}
pinfo(".\n");
}
@@ -1486,17 +1493,20 @@
int i = 2;
while((mrl = (char *) (toxine_get_arg(tox, i))) != NULL) {
- char *expanded_mrl;
- expanded_mrl = tilde_expand(mrl);
-
- tox->playlist.entries[tox->playlist.num++] = strdup(expanded_mrl);
-
- free(expanded_mrl);
-
- if(tox->playlist.cur == -1) {
- tox->playlist.cur = 0;
- toxine_set_current_mrl_from_cur(tox);
+ if(strlen(toxine_atoa(mrl))) {
+ char *expanded_mrl;
+
+ expanded_mrl = tilde_expand(mrl);
+
+ playlist_add_entry(tox, expanded_mrl, NULL, 0, -1);
+
+ free(expanded_mrl);
+
+ if(tox->playlist.cur == -1) {
+ tox->playlist.cur = 0;
+ toxine_set_current_mrl_from_cur(tox);
+ }
}
i++;
}
@@ -1504,38 +1514,45 @@
else if(toxine_is_arg_contain(tox, 1, "from")) {
char **ap;
int i, mrls;
+ char *plugname;
CHECK_XINE(tox);
- pinfo("Grab mrls from '%s' input plugin.\n", toxine_get_arg(tox, 2));
- ap = xine_get_autoplay_mrls(tox->xine, (char *) (toxine_get_arg(tox, 2)), &mrls);
+ plugname = (char *) (toxine_get_arg(tox, 2));
+ pinfo("Grab mrls from '%s' input plugin.\n", plugname);
+ ap = xine_get_autoplay_mrls(tox->xine, plugname, &mrls);
if(ap && mrls) {
- for(i = 0; i < mrls; i++) {
- tox->playlist.entries[tox->playlist.num++] = strdup(ap[i]);
- }
+ for(i = 0; i < mrls; i++)
+ playlist_add_entry(tox, ap[i], NULL, 0, -1);
if(tox->playlist.num && (tox->playlist.cur == -1)) {
tox->playlist.cur = 0;
toxine_set_current_mrl_from_cur(tox);
}
+ pinfo("Plugin '%s' returns %d mrls\n", plugname, tox->playlist.num);
}
else
pinfo("Plugin '%s' returned nothing.\n", toxine_get_arg(tox, 2));
+ pinfo(".\n");
}
else if(toxine_is_arg_contain(tox, 1, "delete")) {
- if(toxine_is_arg_contain(tox, 2, "all")) {
+ if(toxine_is_arg_contain(tox, 2, "all") || toxine_is_arg_contain(tox, 2, "*")) {
if(tox->playlist.num) {
+
+ for(; tox->playlist.num > 0;)
+ playlist_free_entry(tox, (tox->playlist.num - 1));
- for(; tox->playlist.num >= 0; tox->playlist.num--)
- _FREE(tox->playlist.entries[tox->playlist.num]);
+ _FREE(tox->playlist.mmk);
tox->playlist.num = 0;
tox->playlist.cur = -1;
tox->playlist.loop = PLAYLIST_NOLOOP;
+
+ toxine_set_current_mrl_from_cur(tox);
}
}
else {
@@ -1548,21 +1565,22 @@
if(tox->playlist.num && (entry < tox->playlist.num)) {
int j;
- if(tox->playlist.cur >= entry) {
+ if(tox->playlist.cur >= entry)
tox->playlist.cur = -1;
- }
- _FREE(tox->playlist.entries[entry]);
+ playlist_free_entry(tox, entry);
for(j = entry; j < tox->playlist.num; j++)
- tox->playlist.entries[j] = tox->playlist.entries[j + 1];
+ tox->playlist.mmk[j] = tox->playlist.mmk[j + 1];
+
+ tox->playlist.mmk = (mediamark_t **)
+ realloc(tox->playlist.mmk, sizeof(mediamark_t *) * (tox->playlist.num + 2));
- tox->playlist.entries[j] = NULL;
- tox->playlist.num--;
+ tox->playlist.mmk[tox->playlist.num + 1] = NULL;
if(!tox->playlist.num)
tox->playlist.loop = PLAYLIST_NOLOOP;
-
+
if(tox->playlist.num && (tox->playlist.cur == -1)) {
tox->playlist.cur = 0;
toxine_set_current_mrl_from_cur(tox);
@@ -1574,18 +1592,7 @@
}
}
else if(toxine_is_arg_contain(tox, 1, "load")) {
- /*
- * Flush the playlist.
- */
- if(tox->playlist.num) {
-
- for(; tox->playlist.num >= 0; tox->playlist.num--)
- _FREE(tox->playlist.entries[tox->playlist.num]);
-
- tox->playlist.num = 0;
- tox->playlist.cur = -1;
- }
-
+
playlist_load(tox, ((char *) toxine_get_arg(tox, 2)));
tox->playlist.loop = PLAYLIST_NOLOOP;
@@ -1704,4 +1711,33 @@
}
}
}
+}
+
+static void do_mediamk(commands_t *command, toxine_t *tox, void *data) {
+ /*
+ mediamark show
+ mediamarl load
+ mediamark save
+ mediamark delete [#|mrl|id]
+ mediamark delete all
+
+ mediamark add // add mediamark from current playback/time
+ // set id/start/end
+
+ mediamark add mrl <mrl> (id will be == mrl)
+ mediamark add mrl <mrl> id <id> (start = 0, end == -1)
+ mediamark add [mrl <mrl> | id <id>] [start <time> | end <time]
+
+ mediamark add [mrl <mrl> | id <id>] start <time> end <time>
+
+ mediamark edit [#|mrl|id] // can change id/start/end
+
+ mediamark select id;
+
+ mediamark loop
+ mediamark loop [#|mrl|id]
+
+ */
+ pinfo("Function not implemented (yet)\n");
+ pinfo(".\n");
}
Index: common.h
===================================================================
RCS file: /cvsroot/toxine/toxine/src/common.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- common.h 11 Jul 2002 20:30:45 -0000 1.5
+++ common.h 18 Jul 2002 22:19:30 -0000 1.6
@@ -50,6 +50,7 @@
#define MAX_PLAYLIST 2048 /* Max playlist length */
#define PLAYLIST_NOLOOP 0
#define PLAYLIST_LOOP 1
+#define MAX_MEDIAMK 2048
#define poutalign() { \
@@ -103,6 +104,13 @@
char *state;
} prompt_state_t;
+typedef struct {
+ char *ident;
+ char *mrl;
+ int start; /* 0..x (secs) */
+ int end; /* -1 == <till the end> else (secs) */
+} mediamark_t;
+
struct toxine_s {
int autoinit;
int running;
@@ -160,7 +168,8 @@
char *current_mrl;
struct {
- char *entries[MAX_PLAYLIST];
+ mediamark_t **mmk;
+
int num; /* number of entries in playlist */
int cur; /* current entry in playlist */
int loop;
Index: main.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/main.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- main.c 16 Jul 2002 09:15:28 -0000 1.8
+++ main.c 18 Jul 2002 22:19:30 -0000 1.9
@@ -47,6 +47,7 @@
#include "common.h"
#include "utils.h"
#include "commands.h"
+#include "playlist.h"
extern int errno;
@@ -107,8 +108,10 @@
close(tox->msg_fd);
if(tox->playlist.num) {
- for(; tox->playlist.num >= 0; tox->playlist.num--)
- _FREE(tox->playlist.entries[tox->playlist.num]);
+ for(; tox->playlist.num > 0;)
+ playlist_free_entry(tox, (tox->playlist.num - 1));
+
+ _FREE(tox->playlist.mmk);
}
_FREE(tox->configfile);
@@ -259,8 +262,9 @@
}
- tox->config = xine_config_file_init(tox->configfile);
- tox->running = 1;
+ tox->config = xine_config_file_init(tox->configfile);
+ tox->running = 1;
+ tox->playlist.mmk = NULL;
for(i = 0; i < 256; i++)
tox->command.args[i] = (char *) xine_xmalloc(sizeof(char *) * 2048);
Index: playlist.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/playlist.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- playlist.c 11 Jul 2002 20:30:45 -0000 1.2
+++ playlist.c 18 Jul 2002 22:19:30 -0000 1.3
@@ -39,12 +39,37 @@
char buf[256];
char *ln;
- char **playlist;
int entries;
char *type;
+
} playlist_t;
-typedef int (*playlist_guess_func_t)(playlist_t *, char *);
+typedef mediamark_t **(*playlist_guess_func_t)(playlist_t *, char *);
+
+static int _playlist_store_mmk(mediamark_t **mmk, char *mrl, char *ident, int start, int end) {
+
+ if((mmk != NULL) && (mrl != NULL)) {
+
+ (*mmk) = (mediamark_t *) xine_xmalloc(sizeof(mediamark_t));
+ (*mmk)->mrl = strdup(mrl);
+ (*mmk)->ident = strdup((ident != NULL) ? ident : mrl);
+ (*mmk)->start = start;
+ (*mmk)->end = end;
+ return 1;
+ }
+
+ return 0;
+}
+
+static int _playlist_free_mmk(mediamark_t **mmk) {
+ if((*mmk) != NULL) {
+ _FREE((*mmk)->ident);
+ _FREE((*mmk)->mrl);
+ _FREE((*mmk));
+ return 1;
+ }
+ return 0;
+}
/*
* Check if filename is a regular file
@@ -110,8 +135,9 @@
/*
* Playlists guessing
*/
-static int guess_xmms_playlist_pls(playlist_t *playlist, char *filename) {
- char *extension;
+static mediamark_t **guess_xmms_playlist_pls(playlist_t *playlist, char *filename) {
+ mediamark_t **mmk = NULL;
+ char *extension;
if(filename) {
if(playlist_check_for_file(filename)) {
@@ -134,15 +160,16 @@
char buffer[2048];
memset(buffer, 0, sizeof(buffer));
- if((sscanf(playlist->ln, "File%d=%s", &entry, &buffer[0])) == 2) {
- playlist->playlist[(entry - 1)] = strdup(buffer);
- }
+
+ if((sscanf(playlist->ln, "File%d=%s", &entry, &buffer[0])) == 2)
+ _playlist_store_mmk(&mmk[(entry - 1)], buffer, NULL, 0, -1);
+
}
else {
if((sscanf(playlist->ln, "NumberOfEntries=%d", &entries_pls)) == 1) {
if(entries_pls) {
playlist->entries = entries_pls;
- playlist->playlist = (char **) xine_xmalloc(sizeof(char *) * (entries_pls + 1));
+ mmk = (mediamark_t **) xine_xmalloc(sizeof(mediamark_t *) * (entries_pls + 1));
}
}
}
@@ -157,20 +184,21 @@
fclose(playlist->fd);
if(valid_pls && entries_pls) {
- playlist->playlist[entries_pls] = NULL;
+ mmk[entries_pls] = NULL;
playlist->type = strdup("PLS");
- return 1;
+ return mmk;
}
}
}
}
}
- return 0;
+ return NULL;
}
-static int guess_xmms_playlist_m3u(playlist_t *playlist, char *filename) {
- char *extension;
+static mediamark_t **guess_xmms_playlist_m3u(playlist_t *playlist, char *filename) {
+ mediamark_t **mmk = NULL;
+ char *extension;
if(filename) {
if(playlist_check_for_file(filename)) {
@@ -191,12 +219,11 @@
entries_pls++;
if(entries_pls == 1)
- playlist->playlist = (char **) xine_xmalloc(sizeof(char *) * 2);
+ mmk = (mediamark_t **) xine_xmalloc(sizeof(mediamark_t *) * 2);
else
- playlist->playlist = (char **)
- realloc(playlist->playlist, (sizeof(char *) * (entries_pls + 1)));
+ mmk = (mediamark_t **) realloc(mmk, sizeof(mediamark_t *) * (entries_pls + 1));
- playlist->playlist[(entries_pls - 1)] = strdup(playlist->ln);
+ _playlist_store_mmk(&mmk[(entries_pls - 1)], playlist->ln, NULL, 0, -1);
playlist->entries = entries_pls;
}
@@ -217,19 +244,20 @@
fclose(playlist->fd);
if(valid_pls && entries_pls) {
- playlist->playlist[entries_pls] = NULL;
+ mmk[entries_pls] = NULL;
playlist->type = strdup("M3U");
- return 1;
+ return mmk;
}
}
}
}
}
- return 0;
+ return NULL;
}
-static int guess_xmms_playlist(playlist_t *playlist, char *filename) {
+static mediamark_t **guess_xmms_playlist(playlist_t *playlist, char *filename) {
+ mediamark_t **mmk = NULL;
if(filename) {
if(playlist_check_for_file(filename)) {
@@ -249,14 +277,13 @@
entries_pls++;
if(entries_pls == 1)
- playlist->playlist = (char **) xine_xmalloc(sizeof(char *) * 2);
+ mmk = (mediamark_t **) xine_xmalloc(sizeof(mediamark_t *) * 2);
else
- playlist->playlist = (char **)
- realloc(playlist->playlist, (sizeof(char *) * (entries_pls + 1)));
+ mmk = (mediamark_t **) realloc(mmk, sizeof(mediamark_t *) * (entries_pls + 1));
- playlist->playlist[(entries_pls - 1)] = strdup(playlist->ln);
+ _playlist_store_mmk(&mmk[(entries_pls - 1)], playlist->ln, NULL, 0, -1);
playlist->entries = entries_pls;
-
+
}
}
@@ -268,19 +295,20 @@
fclose(playlist->fd);
if(valid_pls && entries_pls) {
- playlist->playlist[entries_pls] = NULL;
+ mmk[entries_pls] = NULL;
playlist->type = strdup("XMMS");
- return 1;
+ return mmk;
}
}
}
}
- return 0;
+ return NULL;
}
-static int guess_sfv_playlist(playlist_t *playlist, char *filename) {
- char *extension;
+static mediamark_t **guess_sfv_playlist(playlist_t *playlist, char *filename) {
+ mediamark_t **mmk = NULL;
+ char *extension;
if(filename) {
if(playlist_check_for_file(filename)) {
@@ -308,14 +336,13 @@
entries_pls++;
if(entries_pls == 1)
- playlist->playlist = (char **) xine_xmalloc(sizeof(char *) * 2);
+ mmk = (mediamark_t **) xine_xmalloc(sizeof(mediamark_t *) * 2);
else
- playlist->playlist = (char **)
- realloc(playlist->playlist, (sizeof(char *) * (entries_pls + 1)));
-
- playlist->playlist[(entries_pls - 1)] = strdup(entry);
+ mmk = (mediamark_t **) realloc(mmk, sizeof(mediamark_t *) * (entries_pls + 1));
+
+ _playlist_store_mmk(&mmk[(entries_pls - 1)], entry, NULL, 0, -1);
playlist->entries = entries_pls;
-
+
}
}
}
@@ -326,9 +353,6 @@
char fn[_PATH_MAX + _NAME_MAX + 1];
int n, t;
- /*
- ; 28866404 23:20.36 2002-01-22 113-DearDoctor[1of5].mpg
- */
if((sscanf(playlist->ln, ";%ld %d:%d.%d %d-%d-%d %s",
&size, &h, &m, &s, &Y, &M, &D, &fn[0])) == 8) {
char *p = playlist->ln;
@@ -347,19 +371,20 @@
fclose(playlist->fd);
if(valid_pls && entries_pls) {
- playlist->playlist[entries_pls] = NULL;
+ mmk[entries_pls] = NULL;
playlist->type = strdup("SFV");
- return 1;
+ return mmk;
}
}
}
}
}
- return 0;
+ return NULL;
}
-static int guess_raw_playlist(playlist_t *playlist, char *filename) {
+static mediamark_t **guess_raw_playlist(playlist_t *playlist, char *filename) {
+ mediamark_t **mmk = NULL;
if(filename) {
if(playlist_check_for_file(filename)) {
@@ -377,14 +402,13 @@
entries_pls++;
if(entries_pls == 1)
- playlist->playlist = (char **) xine_xmalloc(sizeof(char *) * 2);
+ mmk = (mediamark_t **) xine_xmalloc(sizeof(mediamark_t *) * 2);
else
- playlist->playlist = (char **)
- realloc(playlist->playlist, (sizeof(char *) * (entries_pls + 1)));
+ mmk = (mediamark_t **) realloc(mmk, sizeof(mediamark_t *) * (entries_pls + 1));
- playlist->playlist[(entries_pls - 1)] = strdup(playlist->ln);
+ _playlist_store_mmk(&mmk[(entries_pls - 1)], playlist->ln, NULL, 0, -1);
playlist->entries = entries_pls;
-
+
}
}
}
@@ -392,23 +416,44 @@
fclose(playlist->fd);
if(entries_pls) {
- playlist->playlist[entries_pls] = NULL;
+ mmk[entries_pls] = NULL;
playlist->type = strdup("RAW");
- return 1;
+ return mmk;
}
}
}
}
- return 0;
+ return NULL;
}
+
/*
- * END OF: Playlists guessing
+ * Public
*/
+void playlist_add_entry(toxine_t *tox, char *mrl, char *ident, int start, int end) {
+ if(!tox->playlist.num)
+ tox->playlist.mmk = (mediamark_t **) xine_xmalloc(sizeof(mediamark_t *) * 2);
+ else
+ tox->playlist.mmk = (mediamark_t **)
+ realloc(tox->playlist.mmk, sizeof(mediamark_t *) * (tox->playlist.num + 1));
+
+ if(_playlist_store_mmk(&tox->playlist.mmk[tox->playlist.num], mrl, ident, start, end))
+ tox->playlist.num++;
+}
+
+void playlist_free_entry(toxine_t *tox, int offset) {
+
+ if(tox->playlist.num && (offset < tox->playlist.num)) {
+ if(_playlist_free_mmk(&tox->playlist.mmk[offset]))
+ tox->playlist.num--;
+ }
+}
void playlist_load(toxine_t *tox, char *filename) {
playlist_t *playlist;
- int i, found;
+ int i, found, onum;
+ mediamark_t **mmk = NULL;
+ mediamark_t **ommk;
playlist_guess_func_t guess_functions[] = {
guess_xmms_playlist_pls,
guess_xmms_playlist_m3u,
@@ -421,7 +466,7 @@
playlist = (playlist_t *) xine_xmalloc(sizeof(playlist_t));
for(i = 0, found = 0; (guess_functions[i] != NULL) && (found == 0); i++) {
- if(guess_functions[i](playlist, filename))
+ if((mmk = guess_functions[i](playlist, filename)) != NULL)
found = 1;
}
@@ -434,18 +479,18 @@
return;
}
- /* printf("playlist type '%s'\n", playlist->type); */
- /* printf("playlist entries %d\n", playlist->entries); */
- for(i = 0; i < playlist->entries; i++) {
- /* printf("playlist%d='%s'\n", i+1, playlist->playlist[i]); */
- tox->playlist.entries[tox->playlist.num++] = strdup(playlist->playlist[i]);
- }
+ ommk = tox->playlist.mmk;
+ onum = tox->playlist.num;
- for(i = 0; i < playlist->entries; i++) {
- _FREE(playlist->playlist[i]);
- }
-
- _FREE(playlist->playlist);
+ tox->playlist.mmk = mmk;
+ tox->playlist.num = playlist->entries;
+ tox->playlist.cur = -1;
+
+ for(i = 0; i < onum; i++)
+ (void) _playlist_free_mmk(&ommk[i]);
+
+ _FREE(ommk);
+
_FREE(playlist->type);
_FREE(playlist);
}
@@ -475,11 +520,18 @@
FILE *fd;
if((fd = fopen(filename, "w")) != NULL) {
-
+
+#warning implement loader
fprintf(fd, "; toxine playlist\n");
- for(i = 0; i < tox->playlist.num; i++)
- fprintf(fd, "%s\n", tox->playlist.entries[i]);
+ for(i = 0; i < tox->playlist.num; i++) {
+ fprintf(fd, "\nentry {\n");
+ fprintf(fd, " identifier = %s\n", tox->playlist.mmk[i]->ident);
+ fprintf(fd, " mrl = %s\n", tox->playlist.mmk[i]->mrl);
+ fprintf(fd, " start = %d\n", tox->playlist.mmk[i]->start);
+ fprintf(fd, " end = %d\n", tox->playlist.mmk[i]->end);
+ fprintf(fd,"}\n");
+ }
fprintf(fd, "; END\n");
Index: playlist.h
===================================================================
RCS file: /cvsroot/toxine/toxine/src/playlist.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- playlist.h 8 Jul 2002 12:54:48 -0000 1.1
+++ playlist.h 18 Jul 2002 22:19:30 -0000 1.2
@@ -22,6 +22,9 @@
#include "common.h"
+void playlist_add_entry(toxine_t *tox, char *mrl, char *ident, int start, int end);
+void playlist_free_entry(toxine_t *tox, int offset);
+
void playlist_load(toxine_t *tox, char *filename);
void playlist_save(toxine_t *tox, char *filename);
Index: utils.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/utils.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- utils.c 8 Jul 2002 13:59:00 -0000 1.4
+++ utils.c 18 Jul 2002 22:19:30 -0000 1.5
@@ -36,6 +36,7 @@
extern int errno;
#include "common.h"
+#include "playlist.h"
extern prompt_state_t prompt_state[];
@@ -160,8 +161,6 @@
memset(tox->command.line, 0, sizeof(tox->command.line));
sprintf(tox->command.line, "%s", line);
- // if(tox->command.remain)
- // _FREE(tox->command.remain);
}
}
@@ -173,7 +172,7 @@
if(tox->playlist.num) {
for(i = 0; i < tox->playlist.num; i++) {
- if(!strcmp(mrl, tox->playlist.entries[i]))
+ if(!strcmp(mrl, tox->playlist.mmk[i]->mrl))
return i;
}
}
@@ -186,10 +185,15 @@
*/
void toxine_set_current_mrl_from_cur(toxine_t *tox) {
if(tox) {
- if((tox->playlist.cur >= 0) && (tox->playlist.entries[tox->playlist.cur] != NULL))
- tox->current_mrl = tox->playlist.entries[tox->playlist.cur];
- else
+ if((tox->playlist.cur >= 0)
+ && tox->playlist.mmk
+ && tox->playlist.mmk[tox->playlist.cur]
+ && (tox->playlist.mmk[tox->playlist.cur]->mrl != NULL))
+ tox->current_mrl = tox->playlist.mmk[tox->playlist.cur]->mrl;
+ else {
tox->current_mrl = NULL;
+ tox->playlist.cur = -1;
+ }
}
}
@@ -204,8 +208,8 @@
expanded_mrl = tilde_expand(mrl);
- tox->playlist.cur = tox->playlist.num++;
- tox->playlist.entries[tox->playlist.cur] = strdup(expanded_mrl);
+ playlist_add_entry(tox, expanded_mrl, NULL, 0, -1);
+ tox->playlist.cur = tox->playlist.num;
free(expanded_mrl);
}
@@ -223,7 +227,7 @@
if(tox->playlist.cur >= (tox->playlist.num - 1))
return NULL;
- return tox->playlist.entries[tox->playlist.cur + 1];
+ return tox->playlist.mmk[tox->playlist.cur + 1]->mrl;
}
return NULL;
Index: xine_commands.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/xine_commands.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xine_commands.c 17 Jul 2002 22:08:37 -0000 1.9
+++ xine_commands.c 18 Jul 2002 22:19:30 -0000 1.10
@@ -517,7 +517,6 @@
pthread_mutex_init(&tox->event.mutex, NULL);
pinfo("xine_register_event_listener()\n");
xine_register_event_listener(tox->xine, toxine_event_listener, (void *) tox);
-
pinfo(".\n");
}
|
