toxine-cvs Mailing List for toxine (Page 6)
Brought to you by:
f1rmb
Menu
▾
▴
toxine-cvs — CVS log mailing list
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(3) |
Jun
(19) |
Jul
(81) |
Aug
(18) |
Sep
(38) |
Oct
|
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(24) |
Feb
|
Mar
|
Apr
|
May
(3) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(9) |
Nov
|
Dec
|
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
(23) |
May
(36) |
Jun
(7) |
Jul
(29) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(3) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Daniel Caujolle-B. <f1...@us...> - 2003-01-17 22:56:47
|
Update of /cvsroot/toxine/toxine/src
In directory sc8-pr-cvs1:/tmp/cvs-serv29478/src
Modified Files:
Makefile.am commands.c common.h main.c utils.c xine_commands.c
xine_commands.h
Log Message:
@@it compile, but don't try to start it, that will not work
Index: Makefile.am
===================================================================
RCS file: /cvsroot/toxine/toxine/src/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.am 17 Sep 2002 22:23:03 -0000 1.5
+++ Makefile.am 17 Jan 2003 22:56:27 -0000 1.6
@@ -33,7 +33,7 @@
debug:
- @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)"
+ @$(MAKE) CFLAGS="$(DEBUG_CFLAGS) @XINE_CFLAGS@"
install-debug: debug
@list='$(SUBDIRS)'; for subdir in $$list; do \
Index: commands.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/commands.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- commands.c 15 Jan 2003 17:40:11 -0000 1.45
+++ commands.c 17 Jan 2003 22:56:28 -0000 1.46
@@ -50,54 +50,64 @@
char *name;
uint32_t event;
} event_struct[] = {
- { "MOUSE_BUTTON" , XINE_EVENT_MOUSE_BUTTON },
- { "MOUSE_MOVE" , XINE_EVENT_MOUSE_MOVE },
- { "SPU_BUTTON" , XINE_EVENT_SPU_BUTTON },
- { "SPU_CLUT" , XINE_EVENT_SPU_CLUT },
- { "UI_CHANNELS_CHANGED" , XINE_EVENT_UI_CHANNELS_CHANGED },
- { "UI_SET_TITLE" , XINE_EVENT_UI_SET_TITLE },
- { "INPUT_MENU1" , XINE_EVENT_INPUT_MENU1 },
- { "INPUT_MENU2" , XINE_EVENT_INPUT_MENU2 },
- { "INPUT_MENU3" , XINE_EVENT_INPUT_MENU3 },
- { "INPUT_UP" , XINE_EVENT_INPUT_UP },
- { "INPUT_DOWN" , XINE_EVENT_INPUT_DOWN },
- { "INPUT_LEFT" , XINE_EVENT_INPUT_LEFT },
- { "INPUT_RIGHT" , XINE_EVENT_INPUT_RIGHT },
- { "INPUT_SELECT" , XINE_EVENT_INPUT_SELECT },
- { "PLAYBACK_FINISHED" , XINE_EVENT_PLAYBACK_FINISHED },
- { "BRANCHED" , XINE_EVENT_BRANCHED },
- { "NEED_NEXT_MRL" , XINE_EVENT_NEED_NEXT_MRL },
- { "INPUT_NEXT" , XINE_EVENT_INPUT_NEXT },
- { "INPUT_PREVIOUS" , XINE_EVENT_INPUT_PREVIOUS },
- { "INPUT_ANGLE_NEXT" , XINE_EVENT_INPUT_ANGLE_NEXT },
- { "INPUT_ANGLE_PREVIOUS", XINE_EVENT_INPUT_ANGLE_PREVIOUS },
- { "SPU_FORCEDISPLAY" , XINE_EVENT_SPU_FORCEDISPLAY },
- { "FRAME_CHANGE" , XINE_EVENT_FRAME_CHANGE },
- { "CLOSED_CAPTION" , XINE_EVENT_CLOSED_CAPTION },
- { "INPUT_BUTTON_FORCE" , XINE_EVENT_INPUT_BUTTON_FORCE },
- { "INPUT_MENU4" , XINE_EVENT_INPUT_MENU4 },
- { "INPUT_MENU5" , XINE_EVENT_INPUT_MENU5 },
- { "INPUT_MENU6" , XINE_EVENT_INPUT_MENU6 },
- { "INPUT_MENU7" , XINE_EVENT_INPUT_MENU7 },
- { "INPUT_NUMBER_0" , XINE_EVENT_INPUT_NUMBER_0 },
- { "INPUT_NUMBER_1" , XINE_EVENT_INPUT_NUMBER_1 },
- { "INPUT_NUMBER_2" , XINE_EVENT_INPUT_NUMBER_2 },
- { "INPUT_NUMBER_3" , XINE_EVENT_INPUT_NUMBER_3 },
- { "INPUT_NUMBER_4" , XINE_EVENT_INPUT_NUMBER_4 },
- { "INPUT_NUMBER_5" , XINE_EVENT_INPUT_NUMBER_5 },
- { "INPUT_NUMBER_6" , XINE_EVENT_INPUT_NUMBER_6 },
- { "INPUT_NUMBER_7" , XINE_EVENT_INPUT_NUMBER_7 },
- { "INPUT_NUMBER_8" , XINE_EVENT_INPUT_NUMBER_8 },
- { "INPUT_NUMBER_9" , XINE_EVENT_INPUT_NUMBER_9 },
- { "INPUT_NUMBER_10_ADD" , XINE_EVENT_INPUT_NUMBER_10_ADD },
- { "ASPECT_CHANGE" , XINE_EVENT_ASPECT_CHANGE },
- { "OUTPUT_VIDEO" , XINE_EVENT_OUTPUT_VIDEO },
- { "OUTPUT_NO_VIDEO" , XINE_EVENT_OUTPUT_NO_VIDEO },
- { "UI_MESSAGE" , XINE_EVENT_UI_MESSAGE },
+ { "PLAYBACK_FINISHED" , XINE_EVENT_UI_PLAYBACK_FINISHED },
+ { "UI_CHANNELS_CHANGED" , XINE_EVENT_UI_CHANNELS_CHANGED },
+ { "UI_SET_TITLE" , XINE_EVENT_UI_SET_TITLE },
+ { "UI_MESSAGE" , XINE_EVENT_UI_MESSAGE },
+ { "FRAME_FORMAT_CHANGE" , XINE_EVENT_FRAME_FORMAT_CHANGE },
+ { "AUDIO_LEVEL" , XINE_EVENT_AUDIO_LEVEL },
+ { "QUIT" , XINE_EVENT_QUIT },
+ { "PROGRESS" , XINE_EVENT_PROGRESS },
+ /*
+ { "SPU_BUTTON" , XINE_EVENT_SPU_BUTTON },
+ { "SPU_CLUT" , XINE_EVENT_SPU_CLUT },
+ { "UI_CHANNELS_CHANGED" , XINE_EVENT_UI_CHANNELS_CHANGED },
+ { "UI_SET_TITLE" , XINE_EVENT_UI_SET_TITLE },
+ { "PLAYBACK_FINISHED" , XINE_EVENT_PLAYBACK_FINISHED },
+ { "BRANCHED" , XINE_EVENT_BRANCHED },
+ { "NEED_NEXT_MRL" , XINE_EVENT_NEED_NEXT_MRL },
+ { "SPU_FORCEDISPLAY" , XINE_EVENT_SPU_FORCEDISPLAY },
+ { "FRAME_CHANGE" , XINE_EVENT_FRAME_CHANGE },
+ { "CLOSED_CAPTION" , XINE_EVENT_CLOSED_CAPTION },
+ { "ASPECT_CHANGE" , XINE_EVENT_ASPECT_CHANGE },
+ { "OUTPUT_VIDEO" , XINE_EVENT_OUTPUT_VIDEO },
+ { "OUTPUT_NO_VIDEO" , XINE_EVENT_OUTPUT_NO_VIDEO },
+ { "UI_MESSAGE" , XINE_EVENT_UI_MESSAGE },
+ */
+ { "INPUT_MOUSE_BUTTON" , XINE_EVENT_INPUT_MOUSE_BUTTON },
+ { "INPUT_MOUSE_MOVE" , XINE_EVENT_INPUT_MOUSE_MOVE },
+ { "INPUT_MENU1" , XINE_EVENT_INPUT_MENU1 },
+ { "INPUT_MENU2" , XINE_EVENT_INPUT_MENU2 },
+ { "INPUT_MENU3" , XINE_EVENT_INPUT_MENU3 },
+ { "INPUT_MENU4" , XINE_EVENT_INPUT_MENU4 },
+ { "INPUT_MENU5" , XINE_EVENT_INPUT_MENU5 },
+ { "INPUT_MENU6" , XINE_EVENT_INPUT_MENU6 },
+ { "INPUT_MENU7" , XINE_EVENT_INPUT_MENU7 },
+ { "INPUT_UP" , XINE_EVENT_INPUT_UP },
+ { "INPUT_DOWN" , XINE_EVENT_INPUT_DOWN },
+ { "INPUT_LEFT" , XINE_EVENT_INPUT_LEFT },
+ { "INPUT_RIGHT" , XINE_EVENT_INPUT_RIGHT },
+ { "INPUT_SELECT" , XINE_EVENT_INPUT_SELECT },
+ { "INPUT_NEXT" , XINE_EVENT_INPUT_NEXT },
+ { "INPUT_PREVIOUS" , XINE_EVENT_INPUT_PREVIOUS },
+ { "INPUT_ANGLE_NEXT" , XINE_EVENT_INPUT_ANGLE_NEXT },
+ { "INPUT_ANGLE_PREVIOUS", XINE_EVENT_INPUT_ANGLE_PREVIOUS },
+ { "INPUT_BUTTON_FORCE" , XINE_EVENT_INPUT_BUTTON_FORCE },
+ { "INPUT_NUMBER_0" , XINE_EVENT_INPUT_NUMBER_0 },
+ { "INPUT_NUMBER_1" , XINE_EVENT_INPUT_NUMBER_1 },
+ { "INPUT_NUMBER_2" , XINE_EVENT_INPUT_NUMBER_2 },
+ { "INPUT_NUMBER_3" , XINE_EVENT_INPUT_NUMBER_3 },
+ { "INPUT_NUMBER_4" , XINE_EVENT_INPUT_NUMBER_4 },
+ { "INPUT_NUMBER_5" , XINE_EVENT_INPUT_NUMBER_5 },
+ { "INPUT_NUMBER_6" , XINE_EVENT_INPUT_NUMBER_6 },
+ { "INPUT_NUMBER_7" , XINE_EVENT_INPUT_NUMBER_7 },
+ { "INPUT_NUMBER_8" , XINE_EVENT_INPUT_NUMBER_8 },
+ { "INPUT_NUMBER_9" , XINE_EVENT_INPUT_NUMBER_9 },
+ { "INPUT_NUMBER_10_ADD" , XINE_EVENT_INPUT_NUMBER_10_ADD },
/* Following aren't xine's events, just hack */
- { "FOREVER" , XINE_EVENT_UI_MESSAGE + 1 },
- { "NOTHING" , XINE_EVENT_UI_MESSAGE + 1 },
- { NULL , 0 }
+ { "FOREVER" , XINE_EVENT_INPUT_NUMBER_10_ADD + 1 },
+ { "NOTHING" , XINE_EVENT_INPUT_NUMBER_10_ADD + 1 },
+ { NULL , 0 }
};
static struct status_struct_s {
@@ -447,14 +457,14 @@
tox->playlist.thread_num++;
cur = tox->playlist.cur;
- while(tox->event.last.type != XINE_EVENT_PLAYBACK_FINISHED) {
+ while(tox->event.last.type != XINE_EVENT_UI_PLAYBACK_FINISHED) {
xine_usec_sleep(500000.0);
- if(tox->xine_new && tox->xine_open) {
+ if((tox->xine_state & (XINE_NEW | XINE_OPEN))) {
int secs;
- secs = xine_get_pos_length(tox->xine, NULL, &secs, NULL);
+ secs = xine_get_pos_length(tox->stream, NULL, &secs, NULL);
secs /= 1000;
if(cur == tox->playlist.cur) {
@@ -491,11 +501,12 @@
pthread_mutex_unlock(&tox->event.mutex);
switch(tox->event.last.type) {
- case XINE_EVENT_PLAYBACK_FINISHED:
+ case XINE_EVENT_UI_PLAYBACK_FINISHED:
finished_cb(tox);
tox->ignore_finished = 0;
break;
+ /*
case XINE_EVENT_NEED_NEXT_MRL: {
xine_next_mrl_event_t *uevent = (xine_next_mrl_event_t *)event;
@@ -507,9 +518,10 @@
case XINE_EVENT_BRANCHED:
toxine_branched(tox);
break;
+ */
}
-
+#warning FIXME
#if 0
pinfo("Get xine event:\n");
poutalign();
@@ -741,9 +753,9 @@
return 0;
}
- if(tox->audio.driver == NULL) {
- tox->audio.driver = xine_open_audio_driver(tox->xine, (const char*)tox->audio.name, NULL);
- if(tox->audio.driver == NULL) {
+ if(tox->audio.port == NULL) {
+ tox->audio.port = xine_open_audio_driver(tox->xine, (const char*)tox->audio.name, NULL);
+ if(tox->audio.port == NULL) {
perr("xine_load_audio_output_plugin() failed to load '%s' driver.\n", tox->audio.name);
return 0;
}
@@ -1011,7 +1023,7 @@
}
/* deinit video_out plugin */
- if(tox->xine_init) {
+ if(tox->xine_state & XINE_INIT) {
if(tox->playlist.thread_num > 0) {
void *v;
@@ -1181,7 +1193,7 @@
else if(toxine_is_arg_contain(tox, 2, "driver")) {
if(nargs >= 3) {
- if(tox->xine_init) {
+ if(tox->xine_state & XINE_INIT) {
perr("xine engine already initialized.\n");
return;
}
@@ -1211,7 +1223,7 @@
if(toxine_is_arg_contain(tox, 2, "driver")) {
if(nargs >= 3) {
- if(tox->xine_init) {
+ if(tox->xine_state & XINE_INIT) {
perr("xine engine already initialized.\n");
return;
}
@@ -1315,10 +1327,10 @@
return_if_no_init(tox);
- if((xine_get_param(tox->xine, XINE_PARAM_SPEED)) != XINE_SPEED_PAUSE)
- xine_set_param(tox->xine, XINE_PARAM_SPEED, XINE_SPEED_PAUSE);
+ if((xine_get_param(tox->stream, XINE_PARAM_SPEED)) != XINE_SPEED_PAUSE)
+ xine_set_param(tox->stream, XINE_PARAM_SPEED, XINE_SPEED_PAUSE);
else
- xine_set_param(tox->xine, XINE_PARAM_SPEED, XINE_SPEED_NORMAL);
+ xine_set_param(tox->stream, XINE_PARAM_SPEED, XINE_SPEED_NORMAL);
}
@@ -1330,7 +1342,7 @@
return_if_no_init(tox);
- if((xine_get_stream_info(tox->xine, XINE_STREAM_INFO_SEEKABLE)) == 0)
+ if((xine_get_stream_info(tox->stream, XINE_STREAM_INFO_SEEKABLE)) == 0)
return;
if(!tox->current_mrl) {
@@ -1340,7 +1352,7 @@
pos = atoi((toxine_get_arg(tox, 1)));
- if(!xine_play(tox->xine, pos, 0))
+ if(!xine_play(tox->stream, pos, 0))
fprintf(stderr, "xine_play() failed.\n");
}
@@ -1354,7 +1366,7 @@
return_if_no_init(tox);
- if((xine_get_stream_info(tox->xine, XINE_STREAM_INFO_SEEKABLE)) == 0)
+ if((xine_get_stream_info(tox->stream, XINE_STREAM_INFO_SEEKABLE)) == 0)
return;
if(!tox->current_mrl) {
@@ -1362,7 +1374,7 @@
return;
}
- xine_get_pos_length(tox->xine, NULL, &sec, NULL);
+ xine_get_pos_length(tox->stream, NULL, &sec, NULL);
sec /= 1000;
offset = atoi((toxine_get_arg(tox, 1)));
@@ -1371,7 +1383,7 @@
else
sec += offset;
- if(!xine_play(tox->xine, 0, sec))
+ if(!xine_play(tox->stream, 0, sec))
fprintf(stderr, "xine_play() failed.\n");
}
@@ -1558,7 +1570,7 @@
if(status_value >= 0) { /* STOP PLAY QUIT */
do {
xine_usec_sleep((1/90000.0)*2);
- status = xine_get_status(tox->xine);
+ status = xine_get_status(tox->stream);
status_happend = (status == status_value) ? 1 : 0;
} while(!status_happend);
@@ -1594,7 +1606,7 @@
do {
xine_usec_sleep((1/90000.0)*2);
- speed_status = xine_get_param(tox->xine, XINE_PARAM_SPEED);
+ speed_status = xine_get_param(tox->stream, XINE_PARAM_SPEED);
status_happend = (speed == speed_status) ? 1 : 0;
} while(!status_happend);
@@ -1635,7 +1647,7 @@
for(i = 0; event_aliases[i].alias != NULL; i++) {
if(!strncmp(command->command, event_aliases[i].alias, strlen(command->command))) {
- _xine_send_event(command, tox, (void *) event_aliases[i].event);
+ _xine_event_send(command, tox, (void *) event_aliases[i].event);
break;
}
}
@@ -1711,7 +1723,7 @@
* start playback with new selected stream
*/
if(tox->xine && (old_cur != tox->playlist.cur)) {
- int status = xine_get_status(tox->xine);
+ int status = xine_get_status(tox->stream);
if(status == XINE_STATUS_PLAY)
_xine_play(NULL, tox, (void *)NO_ARGS);
@@ -1744,7 +1756,7 @@
}
}
else if(toxine_is_arg_contain(tox, 1, "from")) {
- const char *const *ap;
+ char **ap;
int i, mrls;
const char *plugname;
@@ -1901,7 +1913,7 @@
return_if_no_init(tox);
- xine_get_pos_length(tox->xine, &pos, NULL, NULL);
+ xine_get_pos_length(tox->stream, &pos, NULL, NULL);
toxine_draw_bar("Current position", 0, 65535, pos);
}
else if(toxine_is_arg_contain(tox, 2, "time")) {
@@ -1909,7 +1921,7 @@
return_if_no_init(tox);
- xine_get_pos_length(tox->xine, NULL, &seconds, NULL);
+ xine_get_pos_length(tox->stream, NULL, &seconds, NULL);
seconds /= 1000;
pinfo("Current time: %02d:%02d:%02d\n",
seconds / (60 * 60), (seconds / 60) % 60, seconds % 60);
@@ -2323,7 +2335,7 @@
* start playback with new selected stream
*/
if(tox->xine && (old_cur != tox->playlist.cur)) {
- int status = xine_get_status(tox->xine);
+ int status = xine_get_status(tox->stream);
if(status == XINE_STATUS_PLAY)
_xine_play(NULL, tox, (void *)NO_ARGS);
@@ -2342,6 +2354,8 @@
static char *get_var(toxine_t *tox, const char *var) {
+#warning FIXME
+#if 0
if(tox && var) {
char *variable;
@@ -2434,6 +2448,7 @@
}
}
}
+#endif
return NULL;
}
Index: common.h
===================================================================
RCS file: /cvsroot/toxine/toxine/src/common.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- common.h 21 Sep 2002 00:07:29 -0000 1.18
+++ common.h 17 Jan 2003 22:56:30 -0000 1.19
@@ -50,6 +50,10 @@
#define PLAYLIST_LOOP 0
#define PLAYLIST_MRL_LOOP 1
+#define XINE_INIT 0x000000001
+#define XINE_NEW 0x000000002
+#define XINE_OPEN 0x000000004
+
#define toxine_free(x) do { \
if((x)) { \
free((x)); \
@@ -90,7 +94,7 @@
} while(0)
#define return_if_no_init(x) do { \
- if(((x)->xine == NULL) || ((x)->xine_init != 1)) { \
+ if(((x)->xine == NULL) || !((x)->xine_state & XINE_INIT)) { \
perr("%s(): xine engine uninitialized. Do it first.\n", \
__tox_func__); \
return; \
@@ -98,7 +102,7 @@
} while(0)
#define return_if_no_new(x) do { \
- if(((x)->xine == NULL) || ((x)->xine_new != 1)) { \
+ if(((x)->xine == NULL) || !((x)->xine_state & XINE_NEW)) { \
perr("%s(): xine instance not created. Do it first.\n", \
__tox_func__); \
return; \
@@ -106,7 +110,7 @@
} while(0)
#define return_if_no_open(x) do { \
- if(((x)->xine == NULL) || ((x)->xine_open != 1)) { \
+ if(((x)->xine == NULL) || !((x)->xine_state & XINE_OPEN)) { \
perr("%s(): mrl not opened. Do it first.\n", \
__tox_func__); \
return; \
@@ -138,25 +142,25 @@
} mediamark_t;
struct toxine_s {
+ xine_t *xine;
+ xine_stream_t *stream;
+
int autoinit;
int running;
- char *last_result;
+ // char *last_result;
char *configfile;
- const xine_t *xine;
- int xine_init; /* Bool: 1 after xine_init() success */
- int xine_new; /* Bool: 1 after xine_new() */
- int xine_open; /* Bool: 1 after xine_open() success */
-
+ uint32_t xine_state; /* bitfield, see XINE_* */
+
int ignore_finished;
-
+
int msg_fd;
int loop_mode;
struct {
- const xine_vo_driver_t *driver;
+ xine_video_port_t *port;
const char *name;
int spu_channel;
@@ -169,7 +173,7 @@
} video;
struct {
- const xine_ao_driver_t *driver;
+ xine_audio_port_t *port;
const char *name;
int channel;
Index: main.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/main.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- main.c 21 Sep 2002 00:07:29 -0000 1.19
+++ main.c 17 Jan 2003 22:56:31 -0000 1.20
@@ -124,7 +124,7 @@
toxine_free(tox->command.line);
toxine_free(tox->command.remain);
toxine_free(tox->command.command);
- toxine_free(tox->last_result);
+ // toxine_free(tox->last_result);
for(i = 0; i < 256; i++)
toxine_free(tox->command.args[i]);
@@ -274,14 +274,12 @@
tox->xine = xine_new();
toxine_config_load(tox);
- tox->xine_init = 0;
- tox->xine_new = 1;
- tox->xine_open = 0;
+ tox->xine_state = 0;
tox->running = 1;
tox->playlist.mmk = NULL;
tox->playlist.thread_num = 0;;
tox->loop_mode = PLAYLIST_LOOP;
- tox->last_result = NULL;
+ // tox->last_result = NULL;
for(i = 0; i < 256; i++)
tox->command.args[i] = (char *) xine_xmalloc(sizeof(char *) * 2048);
Index: utils.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/utils.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- utils.c 21 Sep 2002 12:23:56 -0000 1.16
+++ utils.c 17 Jan 2003 22:56:31 -0000 1.17
@@ -163,7 +163,7 @@
int i = 0, s = -1;
if(tox->xine)
- s = xine_get_status(tox->xine);
+ s = xine_get_status(tox->stream);
while(prompt_state[i].state != NULL) {
if(prompt_state[i].xine_state == s) {
@@ -459,6 +459,7 @@
return 1;
}
+#if 0
/*
*
*/
@@ -528,7 +529,7 @@
if(tox)
toxine_set_last_int_result(tox, -1);
}
-
+#endif
static void _config_update(toxine_t *tox,
xine_cfg_entry_t *entry,
int type, int min, int max, int value, char *string) {
Index: xine_commands.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/xine_commands.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- xine_commands.c 21 Sep 2002 12:23:56 -0000 1.29
+++ xine_commands.c 17 Jan 2003 22:56:32 -0000 1.30
@@ -45,10 +45,10 @@
char *name;
int status;
} xine_status[] = {
+ { "XINE_STATUS_IDLE", XINE_STATUS_IDLE },
{ "XINE_STATUS_STOP", XINE_STATUS_STOP },
{ "XINE_STATUS_PLAY" , XINE_STATUS_PLAY },
{ "XINE_STATUS_QUIT" , XINE_STATUS_QUIT },
- { "XINE_STATUS_LOGO" , XINE_STATUS_LOGO },
{ NULL , 0 }
};
[...1089 lines suppressed...]
- toxine_unset_last_result(tox);
+ // toxine_unset_last_result(tox);
nargs = toxine_is_args(tox);
if(nargs == 1) {
@@ -2479,12 +2476,12 @@
uint32_t caps;
int i;
- toxine_unset_last_result(tox);
+ // toxine_unset_last_result(tox);
CHECK_XINE(tox);
pinfo("xine_get_input_plugin_capabilities():\n");
caps = xine_get_input_plugin_capabilities(tox->xine);
- toxine_set_last_int_result(tox, caps);
+ // toxine_set_last_int_result(tox, caps);
pinfo("capabilities (0x%x):\n", caps);
for(i = 0; input_caps[i].name != NULL; i++) {
Index: xine_commands.h
===================================================================
RCS file: /cvsroot/toxine/toxine/src/xine_commands.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xine_commands.h 21 Sep 2002 12:23:56 -0000 1.17
+++ xine_commands.h 17 Jan 2003 22:56:34 -0000 1.18
@@ -48,7 +48,7 @@
void _xine_get_input_plugin_description(commands_t *, toxine_t *, void *);
void _xine_list_audio_output_plugins(commands_t *, toxine_t *, void *);
void _xine_list_video_output_plugins(commands_t *, toxine_t *, void *);
-void _xine_send_event(commands_t *, toxine_t *, void *);
+void _xine_event_send(commands_t *, toxine_t *, void *);
void _xine_config_get_first_entry(commands_t *, toxine_t *, void *);
void _xine_config_get_next_entry(commands_t *, toxine_t *, void *);
void _xine_config_lookup_entry(commands_t *, toxine_t *, void *);
@@ -253,9 +253,9 @@
"List video output plugin installed.", \
"xine_list_video_output_plugins" \
}, \
- { "xine_send_event", REQUIRE_ARGS, _xine_send_event, \
+ { "xine_event_send", REQUIRE_ARGS, _xine_event_send, \
"Send an event to the engine.", \
- "xine_send_event <event>\n" \
+ "xine_event_send <event>\n" \
" - event can be:\n" \
" [XINE_EVENT_MOUSE_BUTTON | XINE_EVENT_MOUSE_MOVE | XINE_EVENT_SPU_BUTTON |\n" \
" XINE_EVENT_SPU_CLUT | XINE_EVENT_UI_CHANNELS_CHANGED |\n" \
|
|
From: Daniel Caujolle-B. <f1...@us...> - 2003-01-15 20:34:23
|
Update of /cvsroot/toxine/toxine/src/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv5827
Modified Files:
Makefile.am vo_aa.c vo_dxr3.c vo_none.c vo_x11.c
Log Message:
@@it compile
Index: Makefile.am
===================================================================
RCS file: /cvsroot/toxine/toxine/src/plugins/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.am 15 Jan 2003 17:40:11 -0000 1.6
+++ Makefile.am 15 Jan 2003 20:34:19 -0000 1.7
@@ -1,5 +1,5 @@
-CFLAGS = @CFLAGS@ @X_CFLAGS@ $(AALIB_CFLAGS)
+CFLAGS = @CFLAGS@ @XINE_CFLAGS@ @X_CFLAGS@ $(AALIB_CFLAGS)
DEBUG_CFLAGS = @DEBUG_CFLAGS@ @XINE_CFLAGS@ $(AALIB_CFLAGS)
libdir = $(TOXINE_PLUGINDIR)
Index: vo_aa.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/plugins/vo_aa.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- vo_aa.c 19 Sep 2002 21:04:07 -0000 1.10
+++ vo_aa.c 15 Jan 2003 20:34:19 -0000 1.11
@@ -57,12 +57,12 @@
aa_hidecursor(private->context);
- tox->video.driver = xine_open_video_driver(tox->xine,
- tox->video.name,
- XINE_VISUAL_TYPE_AA,
- (void *) private->context);
+ tox->video.port = xine_open_video_driver(tox->xine,
+ tox->video.name,
+ XINE_VISUAL_TYPE_AA,
+ (void *) private->context);
- if(tox->video.driver == NULL) {
+ if(tox->video.port == NULL) {
fprintf(stderr, "xine_open_video_driver() failed to load '%s' driver.\n",
tox->video.name);
exit(1);
Index: vo_dxr3.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/plugins/vo_dxr3.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- vo_dxr3.c 19 Sep 2002 21:04:07 -0000 1.14
+++ vo_dxr3.c 15 Jan 2003 20:34:20 -0000 1.15
@@ -63,11 +63,11 @@
/* Reload config file now */
toxine_config_load(tox);
- tox->video.driver = xine_open_video_driver(tox->xine, drivername, XINE_VISUAL_TYPE_X11, NULL);
+ tox->video.port = xine_open_video_driver(tox->xine, drivername, XINE_VISUAL_TYPE_X11, NULL);
private->init = 1;
- if(tox->video.driver == NULL) {
+ if(tox->video.port == NULL) {
fprintf(stderr, "xine_load_video_output_plugin() failed to load '%s' driver.\n",
drivername);
exit(1);
Index: vo_none.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/plugins/vo_none.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vo_none.c 19 Sep 2002 21:04:07 -0000 1.6
+++ vo_none.c 15 Jan 2003 20:34:20 -0000 1.7
@@ -33,11 +33,11 @@
toxine_vo_plugin_t *vop = (toxine_vo_plugin_t *) tox->video.cur_plugin;
none_private_t *private = (none_private_t *) vop->private;
- tox->video.driver = xine_open_video_driver(tox->xine, tox->video.name, 0, (void *)NULL);
+ tox->video.port = xine_open_video_driver(tox->xine, tox->video.name, 0, (void *)NULL);
private->init = 1;
- if(tox->video.driver == NULL) {
+ if(tox->video.port == NULL) {
fprintf(stderr, "xine_load_video_output_plugin() failed to load '%s' driver.\n",
tox->video.name);
exit(1);
Index: vo_x11.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/plugins/vo_x11.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- vo_x11.c 19 Sep 2002 21:04:07 -0000 1.18
+++ vo_x11.c 15 Jan 2003 20:34:20 -0000 1.19
@@ -252,8 +252,8 @@
private->x11_drawable[private->fullscreen].y);
#endif
- if(tox->video.driver && tox->xine_init)
- xine_gui_send_vo_data(tox->xine, XINE_GUI_SEND_DRAWABLE_CHANGED,
+ if(tox->video.port && (tox->xine_state & XINE_INIT))
+ xine_gui_send_vo_data(tox->stream, XINE_GUI_SEND_DRAWABLE_CHANGED,
(void*) private->x11_drawable[private->fullscreen].video_window);
pthread_mutex_unlock(&private->mutex);
@@ -288,14 +288,14 @@
x11_private_t *private = (x11_private_t *) vop->private;
int screensaver_timer = 0;
- while(!tox->xine_init)
+ while(!(tox->xine_state & XINE_INIT))
usec_sleep(100000);
while(tox->video.running) {
int status;
if(tox->xine != NULL) {
- status = xine_get_status(tox->xine);
+ status = xine_get_status(tox->stream);
if(status == XINE_STATUS_PLAY) {
screensaver_timer++;
@@ -335,8 +335,8 @@
rect.w = 0;
rect.h = 0;
- if(tox->video.driver && tox->xine_init &&
- (xine_gui_send_vo_data(tox->xine,
+ if(tox->video.port && (tox->xine_state & XINE_INIT) &&
+ (xine_gui_send_vo_data(tox->stream,
XINE_GUI_SEND_TRANSLATE_GUI_TO_VIDEO, (void*)&rect) != -1)) {
/* driver implements gui->video coordinate space translation, use it */
*video_x = rect.x;
@@ -454,8 +454,8 @@
x11_private_t *private = (x11_private_t *) vop->private;
XLockDisplay (private->display);
- if(tox->video.driver && tox->xine_init) {
- xine_gui_send_vo_data(tox->xine, XINE_GUI_SEND_SELECT_VISUAL, (void *)&vinfo);
+ if(tox->video.port && (tox->xine_state & XINE_INIT)) {
+ xine_gui_send_vo_data(tox->stream, XINE_GUI_SEND_SELECT_VISUAL, (void *)&vinfo);
if(vinfo != (XVisualInfo *) -1) {
if(!vinfo) {
fprintf (stderr, "videowin: output driver cannot select a working visual\n");
@@ -734,10 +734,10 @@
xine_strdupa(drivername, tox->video.name);
- tox->video.driver = xine_open_video_driver(tox->xine, drivername,
- XINE_VISUAL_TYPE_X11, (void *)&vis);
+ tox->video.port = xine_open_video_driver(tox->xine, drivername,
+ XINE_VISUAL_TYPE_X11, (void *)&vis);
- if(tox->video.driver == NULL) {
+ if(tox->video.port == NULL) {
fprintf(stderr, "xine_open_video_driver() failed to load '%s' driver.\n",
drivername);
exit(1);
@@ -816,40 +816,40 @@
case XK_BackSpace:
/* speed == * 1 */
- if(tox->xine_init) {
- if((xine_get_param(tox->xine, XINE_PARAM_SPEED)) != XINE_SPEED_NORMAL)
- xine_set_param(tox->xine, XINE_PARAM_SPEED, XINE_SPEED_NORMAL);
+ if(tox->xine_state & XINE_INIT) {
+ if((xine_get_param(tox->stream, XINE_PARAM_SPEED)) != XINE_SPEED_NORMAL)
+ xine_set_param(tox->stream, XINE_PARAM_SPEED, XINE_SPEED_NORMAL);
}
break;
case XK_Up:
/* speed++ */
- if(tox->xine_init) {
- if((xine_get_param(tox->xine, XINE_PARAM_SPEED)) < XINE_SPEED_FAST_4) {
- if((xine_get_param(tox->xine, XINE_PARAM_SPEED)) > XINE_SPEED_PAUSE)
- xine_set_param(tox->xine, XINE_PARAM_SPEED,
- ((xine_get_param(tox->xine, XINE_PARAM_SPEED)) * 2));
+ if(tox->xine_state & XINE_INIT) {
+ if((xine_get_param(tox->stream, XINE_PARAM_SPEED)) < XINE_SPEED_FAST_4) {
+ if((xine_get_param(tox->stream, XINE_PARAM_SPEED)) > XINE_SPEED_PAUSE)
+ xine_set_param(tox->stream, XINE_PARAM_SPEED,
+ ((xine_get_param(tox->stream, XINE_PARAM_SPEED)) * 2));
else
- xine_set_param(tox->xine, XINE_PARAM_SPEED, XINE_SPEED_SLOW_4);
+ xine_set_param(tox->stream, XINE_PARAM_SPEED, XINE_SPEED_SLOW_4);
}
}
break;
case XK_Down:
/* speed-- */
- if(tox->xine_init) {
- if((xine_get_param(tox->xine, XINE_PARAM_SPEED)) > XINE_SPEED_PAUSE)
- xine_set_param(tox->xine, XINE_PARAM_SPEED,
- ((xine_get_param(tox->xine, XINE_PARAM_SPEED)) / 2));
+ if(tox->xine_state & XINE_INIT) {
+ if((xine_get_param(tox->stream, XINE_PARAM_SPEED)) > XINE_SPEED_PAUSE)
+ xine_set_param(tox->stream, XINE_PARAM_SPEED,
+ ((xine_get_param(tox->stream, XINE_PARAM_SPEED)) / 2));
}
break;
case XK_space:
- if(tox->xine_init) {
- if(xine_get_param(tox->xine, XINE_PARAM_SPEED) != XINE_SPEED_PAUSE)
- xine_set_param(tox->xine, XINE_PARAM_SPEED, XINE_SPEED_PAUSE);
+ if(tox->xine_state & XINE_INIT) {
+ if(xine_get_param(tox->stream, XINE_PARAM_SPEED) != XINE_SPEED_PAUSE)
+ xine_set_param(tox->stream, XINE_PARAM_SPEED, XINE_SPEED_PAUSE);
else
- xine_set_param(tox->xine, XINE_PARAM_SPEED, XINE_SPEED_NORMAL);
+ xine_set_param(tox->stream, XINE_PARAM_SPEED, XINE_SPEED_NORMAL);
}
break;
}
@@ -858,7 +858,8 @@
case MotionNotify: {
XMotionEvent *mevent = (XMotionEvent *) xev;
- xine_input_event_t xine_event;
+ xine_event_t event;
+ xine_input_data_t input;
int x, y;
if(!private->cursor.visible) {
@@ -868,20 +869,26 @@
/* printf("Mouse event:mx=%d my=%d\n",mevent->x, mevent->y); */
- if((tox->xine_init) &&
+ if((tox->xine_state & XINE_INIT) &&
(video_window_translate_point(tox, vop, mevent->x, mevent->y, &x, &y))) {
- xine_event.event.type = XINE_EVENT_MOUSE_MOVE;
- xine_event.button = 0; /* No buttons, just motion. */
- xine_event.x = x;
- xine_event.y = y;
- xine_send_event(tox->xine, (xine_event_t*)(&xine_event));
+
+ event.type = XINE_EVENT_INPUT_MOUSE_MOVE;
+ event.stream = tox->stream;
+ event.data = &input;
+ event.data_length = sizeof(input);
+ gettimeofday(&event.tv, NULL);
+ input.button = 0; /* No buttons, just motion. */
+ input.x = x;
+ input.y = y;
+ xine_event_send(tox->stream, &event);
}
}
break;
case ButtonPress: {
XButtonEvent *bevent = (XButtonEvent *) xev;
- xine_input_event_t xine_event;
+ xine_event_t event;
+ xine_input_data_t input;
int x, y;
if(!private->cursor.visible) {
@@ -890,13 +897,18 @@
}
if(bevent->button == Button1) {
- if((tox->xine_init) &&
+ if((tox->xine_state & XINE_INIT) &&
(video_window_translate_point(tox, vop, bevent->x, bevent->y, &x, &y))) {
- xine_event.event.type = XINE_EVENT_MOUSE_BUTTON;
- xine_event.button = 1;
- xine_event.x = x;
- xine_event.y = y;
- xine_send_event(tox->xine, (xine_event_t*)(&xine_event));
+
+ event.type = XINE_EVENT_INPUT_MOUSE_BUTTON;
+ event.stream = tox->stream;
+ event.data = &input;
+ event.data_length = sizeof(input);
+ gettimeofday(&event.tv, NULL);
+ input.button = 1;
+ input.x = x;
+ input.y = y;
+ xine_event_send(tox->stream, &event);
}
}
}
@@ -908,8 +920,8 @@
if (xevent->count == 0) {
if((xev->xany.window == private->x11_drawable[private->fullscreen].video_window)
- && tox->video.driver && tox->xine_init)
- xine_gui_send_vo_data(tox->xine, XINE_GUI_SEND_EXPOSE_EVENT, (void *)xev);
+ && tox->video.port && (tox->xine_state & XINE_INIT))
+ xine_gui_send_vo_data(tox->stream, XINE_GUI_SEND_EXPOSE_EVENT, (void *)xev);
}
}
@@ -939,8 +951,8 @@
}
- if((xev->type == private->completion_event) && tox->video.driver && tox->xine_init)
- xine_gui_send_vo_data(tox->xine, XINE_GUI_SEND_COMPLETION_EVENT, (void *)xev);
+ if((xev->type == private->completion_event) && tox->video.port && (tox->xine_state & XINE_INIT))
+ xine_gui_send_vo_data(tox->stream, XINE_GUI_SEND_COMPLETION_EVENT, (void *)xev);
}
@@ -1036,8 +1048,8 @@
*/
static uint32_t get_capabilities(toxine_t *tox) {
- if(tox->video.driver)
- return tox->video.driver->get_capabilities(tox->video.driver);
+ if(tox->video.port)
+ return tox->video.port->get_capabilities(tox->video.port);
return 0;
}
@@ -1047,8 +1059,8 @@
*/
static int get_property(toxine_t *tox, int property) {
- if(tox->video.driver)
- return tox->video.driver->get_property(tox->video.driver, property);
+ if(tox->video.port)
+ return tox->video.port->get_property(tox->video.port, property);
return 0;
}
@@ -1058,8 +1070,8 @@
*/
static void get_property_min_max(toxine_t *tox, int property, int *min, int *max) {
- if(tox->video.driver)
- tox->video.driver->get_property_min_max(tox->video.driver, property, min, max);
+ if(tox->video.port)
+ tox->video.port->get_property_min_max(tox->video.port, property, min, max);
}
@@ -1068,8 +1080,8 @@
*/
static int set_property(toxine_t *tox, int property, int value) {
- if(tox->video.driver)
- return tox->video.driver->set_property(tox->video.driver, property, value);
+ if(tox->video.port)
+ return tox->video.port->set_property(tox->video.port, property, value);
return value;
}
|
|
From: Daniel Caujolle-B. <f1...@us...> - 2003-01-15 17:41:52
|
Update of /cvsroot/toxine/toxine
In directory sc8-pr-cvs1:/tmp/cvs-serv14748
Added Files:
configure.ac
Log Message:
@@more cleanup
--- NEW FILE: configure.ac ---
dnl
dnl Configure.in for xine
dnl
AC_INIT
AC_CONFIG_SRCDIR([src/main.c])
dnl
dnl Require autoconf version 2.13
dnl
AC_PREREQ(2.53)
dnl
dnl Require libtool minimum version 1.4.0
dnl
dnl AC_PREREQ_LIBTOOL(1.4.0,,AC_MSG_ERROR(*** You should have libtool >= 1.4 installed ***))
dnl 0.2.0 was never released
dnl switch directly to 0.3.0 since toxine have is own project site.
TOXINE_MAJOR=0
TOXINE_MINOR=6
TOXINE_SUB=2
TOXINE_PRE="`if test -f ./.cvsversion; then echo cvs;fi`"
TAR_NAME="toxine-"$TOXINE_MAJOR.$TOXINE_MINOR.$TOXINE_SUB$TOXINE_PRE
SPEC_VERSION=$TOXINE_MAJOR.$TOXINE_MINOR.$TOXINE_SUB$TOXINE_PRE
AC_SUBST(TOXINE_MAJOR)
AC_SUBST(TOXINE_MINOR)
AC_SUBST(TOXINE_SUB)
AC_SUBST(TAR_NAME)
AC_SUBST(SPEC_VERSION)
AC_CANONICAL_TARGET([])
AM_INIT_AUTOMAKE("toxine", $TOXINE_MAJOR.$TOXINE_MINOR.$TOXINE_SUB$TOXINE_PRE)
AM_CONFIG_HEADER(config.h)
dnl
dnl Check for programs.
dnl
saved_CFLAGS="$CFLAGS"
AC_ISC_POSIX
CFLAGS="$saved_CFLAGS"
AC_PROG_CC
AC_MINIX dnl readline
AC_HEADER_STDC([])
AC_PROG_MAKE_SET
AC_PROG_INSTALL
dnl obsolete AC_PROG_RANLIB
AC_PROG_LN_S
dnl
dnl Libtool
dnl
AC_LIBTOOL_DLOPEN
AM_DISABLE_STATIC
AM_PROG_LIBTOOL
AC_SUBST(LIBTOOL_DEPS)
if ${CONFIG_SHELL} ./libtool --features | grep "enable static" >/dev/null; then
STATIC="-static"
else
STATIC=
fi
AC_SUBST(STATIC)
dnl
dnl Build all libs as static
dnl
dnl BUILD_LIB_STATIC="-static"
BUILD_LIB_STATIC=""
AC_SUBST(BUILD_LIB_STATIC)
dnl
dnl Checks for typedefs, structures, and compiler characteristics.
dnl
AC_C_CONST
AC_C_INLINE
AC_TYPE_OFF_T
AC_TYPE_SIZE_T
dnl AM_TYPE_PTRDIFF_T
dnl AC_C_BIGENDIAN
AC_SUBST(DEBUG_CFLAGS)
dnl
dnl Check for xine-lib
dnl
dnl required xine lib version (subst in spec file)
REQ_XINE=1.0.0
AM_PATH_XINE($REQ_XINE,, AC_MSG_ERROR(*** You should install xine-lib first ***))
AC_SUBST(REQ_XINE)
dnl
dnl
dnl
dnl AC_ARG_ENABLE(xinelib-cvs,
dnl [ --enable-xinelib-cvs Made toxine compliant with xine-lib CVS version (useful for DXR3 owners)],[ AC_DEFINE(XINELIB_CVS) ],)
dnl
dnl threads: xine-config tell us what should be used, but
dnl xitk need to be linked to thread lib, so the follow AC_SUBST()
dnl are only used in src/xitk/xine-toolkit/Makefile.am
dnl
case "$host" in
*-*-freebsd*)
THREAD_LIBS="-L/usr/local/lib -pthread"
THREAD_CFLAGS="-I/usr/local/include -D_THREAD_SAFE"
CFLAGS="$CFLAGS -L/usr/local/lib $THREAD_CFLAGS"
CPPFLAGS="$CPPFLAGS -I/usr/local/include -L/usr/local/lib"
;;
*)
AC_CHECK_LIB(pthread, pthread_create,
THREAD_LIBS="-lpthread",
AC_MSG_ERROR(pthread needed))
;;
esac
AC_SUBST(THREAD_LIBS)
AC_SUBST(THREAD_CFLAGS)
dnl
dnl dynamic linker
dnl
AC_CHECK_LIB(c, dlopen,
DYNAMIC_LD_LIBS="",
AC_CHECK_LIB(dl, dlopen,
DYNAMIC_LD_LIBS="-ldl",
AC_MSG_ERROR(dynamic linker needed)))
AC_SUBST(DYNAMIC_LD_LIBS)
dnl
dnl Checks for X11
dnl
AC_PATH_XTRA
if test x"$no_x" != x"yes"; then
AC_DEFINE(HAVE_X11,,[Define this if you have X11R6 installed])
fi
dnl
dnl XTest Extension
dnl
AC_CHECK_LIB(Xtst, XTestFakeKeyEvent,
XTEST_LIBS="-lXtst"
AC_DEFINE(HAVE_XTESTEXTENSION,,[Define this if you have libXtst installed])
ac_have_xtest="yes",, $X_LIBS $X_PRE_LIBS -lXext $X_EXTRA_LIBS)
AC_SUBST(XTEST_LIBS)
AM_CONDITIONAL(HAVE_XTESTEXTENSION, test x$ac_have_xtest = "xyes")
AC_CHECK_HEADER(stdarg.h, AC_DEFINE(HAVE_STDARGS,,[Define this is you have stdarg.h header file installe]))
AC_CHECK_HEADERS(string.h strings.h alloca.h)
dnl
dnl readline
dnl
dnl configure defaults
LIBVERSION=4.2a
opt_curses=no
opt_shared=no
dnl arguments to configure
AC_ARG_WITH(curses, [ --with-curses use the curses library instead of the termcap library],
opt_curses=$withval)
if test "$opt_curses" = "yes"; then
prefer_curses=yes
fi
AC_TYPE_SIGNAL([])
AC_HEADER_STAT
AC_HEADER_DIRENT
AC_CHECK_FUNCS(lstat memmove putenv select setenv setlocale \
strcasecmp strpbrk tcgetattr vsnprintf isascii isxdigit getpwuid_r)
AC_FUNC_STRCOLL
AC_CHECK_HEADERS(unistd.h stdlib.h varargs.h stdarg.h string.h strings.h \
limits.h sys/ptem.h sys/pte.h sys/stream.h sys/select.h \
termcap.h termios.h termio.h sys/file.h locale.h memory.h )
dnl BASH_SYS_SIGNAL_VINTAGE dnl pure 2.50
dnl BASH_SYS_REINSTALL_SIGHANDLERS dnl pure 2.50
BASH_SIGNAL_CHECK
BASH_REINSTALL_SIGHANDLERS
BASH_FUNC_POSIX_SETJMP
BASH_FUNC_LSTAT
BASH_CHECK_GETPW_FUNCS
BASH_FUNC_STRCOLL
BASH_TYPE_SIGHANDLER
BASH_HAVE_TIOCGWINSZ
BASH_HAVE_TIOCSTAT
BASH_HAVE_FIONREAD
BASH_MISC_SPEED_T
BASH_STRUCT_WINSIZE
BASH_STRUCT_DIRENT_D_INO
BASH_STRUCT_DIRENT_D_FILENO
dnl yuck
case "$host_os" in
aix*) prefer_curses=yes ;;
esac
BASH_CHECK_LIB_TERMCAP([],
AC_MSG_ERROR([*** termcap support is required to build readline library ***]))
case "$host_cpu" in
*cray*) READLINE_LOCAL_CFLAGS=-DCRAY ;;
*s390*) READLINE_LOCAL_CFLAGS=-fsigned-char ;;
esac
case "$host_os" in
isc*) READLINE_LOCAL_CFLAGS=-Disc386 ;;
esac
AC_SUBST(READLINE_LOCAL_CFLAGS)
AC_SUBST(TERMCAP_LIB)
AC_SUBST(LIBVERSION)
dnl
dnl Checks for Ascii-Art library
dnl
AM_PATH_AALIB(1.2,, AC_MSG_RESULT([*** All of AALIB dependent parts will be disabled ***]))
AM_CONDITIONAL(HAVE_AA, test x$no_aalib != "xyes")
if test "$GCC" = yes; then
dnl
dnl check cflags not supported by all gcc versions
dnl eg: -mpreferred-stack-boundary=2 and 2.91.66,
dnl and gcc-2.7.2.3 support a bit less options
dnl
AC_TRY_CFLAGS("-mpreferred-stack-boundary=2",
m_psb="-mpreferred-stack-boundary=2", m_psb="")
AC_TRY_CFLAGS("-fno-strict-aliasing", f_nsa="-fno-strict-aliasing", f_nsa="")
AC_TRY_CFLAGS("-fschedule-insns2", f_si="-fschedule-insns2", f_si="")
AC_TRY_CFLAGS("-mwide-multiply", m_wm="-mwide-multiply", m_wm="")
fi
dnl Flags not supported by all *cc* variants
AC_TRY_CFLAGS("-Wall", wall="-Wall", wall="")
dnl Common cflags for all platforms
COMMON_CFLAGS="$wall -D_FILE_OFFSET_BITS=64"
host_or_hostalias="$host"
if test "$host_or_hostalias" = ""; then
dnl user has called ./configure with a host parameter unknown to
dnl config.sub
dnl
dnl Try the following switch with user's original host-alias
dnl input instead.
dnl
host_or_hostalias="$host_alias"
fi
case "$host_or_hostalias" in
i386-*-freebsd*)
CFLAGS="$CFLAGS -pipe -fomit-frame-pointer -malign-functions=4 -malign-loops=4 -malign-jumps=4 -malign-functions=4 $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -finline-functions -D_REENTRANT"
DEBUG_CFLAGS="$X_CFLAGS $DEBUG_CFLAGS -D_REENTRANT -DDEBUG"
AC_DEFINE(__i386__,1,[Define this if you're running x86 architecture])
AC_DEFINE([ARCH_X86],,[x86 architecture])
;;
i?86*-*-linux* | i386-*-solaris* | i?86-* | k?-* | athlon-*)
if test "$GCC" = yes; then
dnl Check for gcc cpu optimization support
AC_TRY_CFLAGS("-mcpu=i386",
sarchopt="-mcpu",
AC_TRY_CFLAGS("-march=i386",
sarchopt="-march",
[ AC_MSG_RESULT(** no cpu optimization supports **)
sarchopt=no ]))
dnl special check for k7 cpu CC support
AC_TRY_CFLAGS("$sarchopt=athlon", k7cpu="athlon", k7cpu="i686")
dnl add x86 specific CFLAGS
CFLAGS="$CFLAGS -O3 -pipe -fomit-frame-pointer -malign-functions=4 -malign-loops=4 -malign-jumps=4 -malign-functions=4 $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -finline-functions"
DEBUG_CFLAGS="$DEBUG_CFLAGS -O3"
dnl enable x86 specific parts of the code
if test x"$sarchopt" != "xno"; then
[
archopt_val=
case "$host_alias" in
i386-*) # *BSD return this even on a P III #-))
archopt_val=i386 ;;
i486-*) # oh dear!
archopt_val=i486 ;;
i586-*)
archopt_val=pentium ;;
i686-*)
archopt_val=pentiumpro
if test x"$check_athlon" = "xyes"; then
if test -f /proc/cpuinfo; then
modelname=`cat /proc/cpuinfo | grep "model\ name\ :" | sed -e 's/ //g' | cut -d':' -f2`
case "$modelname" in
*Athlon* | *Duron* | *K7*)
archopt_val="$k7cpu" ;;
esac
fi
fi
;;
k6-*)
archopt_val=k6 ;;
k7-*)
archopt_val=k7 ;;
athlon-*)
archopt_val=athlon ;;
esac
if test x"$archopt_val" != x; then
CFLAGS="$CFLAGS $sarchopt=$archopt_val"
DEBUG_CFLAGS="$DEBUG_CFLAGS $sarchopt=$archopt_val"
fi
]
fi
else
dnl add x86 specific cc CFLAGS
CFLAGS="$CFLAGS -O"
DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
fi
AC_DEFINE(__i386__,,[])
AC_DEFINE([ARCH_X86],,[x86 architecture])
;;
alphaev56-*)
CFLAGS="$CFLAGS -O3 -mcpu=ev56 -mieee"
DEBUG_CFLAGS="$DEBUG_CFLAGS -O3 -mcpu=ev56 -mieee"
;;
alpha*)
CFLAGS="$CFLAGS -O3 -mieee"
DEBUG_CFLAGS="$DEBUG_CFLAGS -O3 -mieee"
;;
ppc-*-linux-* | powerpc-*)
CFLAGS="$CFLAGS -O3 -pipe -fomit-frame-pointer $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -funroll-all-loops -finline-functions"
DEBUG_CFLAGS="$DEBUG_CFLAGS -O3"
;;
sparc64-*-linux-* | sparc-*)
if test "$GCC" = yes; then
CFLAGS="$CFLAGS -O3"
DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
else
CFLAGS="$CFLAGS -O"
DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
fi
;;
mips-*)
CFLAGS="$CFLAGS -O3"
DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
;;
m68k-*)
CFLAGS="$CFLAGS -O2"
DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
;;
ia64-*)
CFLAGS="$CFLAGS -O3"
DEBUG_CFLAGS="$DEBUG_CFLAGS -O3"
;;
s390-*)
CFLAGS="$CFLAGS -O3"
DEBUG_CFLAGS="$DEBUG_CFLAGS -O3"
;;
*)
echo "Host type '$host' ($host_alias) is currently not supported by xine"
exit 1
;;
esac
CFLAGS="$CFLAGS $COMMON_CFLAGS $ALSA_CFLAGS $ESD_CFLAGS"
DEBUG_CFLAGS="$DEBUG_CFLAGS $COMMON_CFLAGS $ALSA_CFLAGS $ESD_CFLAGS -g -DDEBUG"
dnl
dnl Check for GNU getopt_long()
dnl
AC_MSG_CHECKING(for GNU getopt_long)
AC_TRY_RUN([
#include <stdio.h>
#include <stdlib.h>
#include <getopt.h>
static struct option long_options[] = {
{"help" , no_argument, 0, 1 },
{"version" , no_argument, 0, 2 },
{0 , no_argument, 0, 0 }
};
int main(int argc, char **argv) {
int option_index = 0;
int c;
opterr = 0;
while((c = getopt_long(argc, argv, "?hv",
long_options, &option_index)) != EOF) {
}
return 0;
}
], [AC_MSG_RESULT(yes);
ac_getopt_long=yes;
AC_DEFINE(HAVE_GETOPT_LONG,,[[Define this if you have GNU getopt_long() implemented])])],
[AC_MSG_RESULT(no); ac_getopt_long=no],
[AC_MSG_RESULT(no); ac_getopt_long=no])
AM_CONDITIONAL(HAVE_GETOPT_LONG, test x"$ac_getopt_long" = "xyes")
dnl
dnl Where vo plugins will be installed.
dnl
if test "x$prefix" = xNONE; then
prefix="${ac_default_prefix}"
fi
if test "x$exec_prefix" = xNONE; then
exec_prefix='${prefix}'
fi
TOXINE_PLUGINDIR="$libdir/toxine/plugins"
eval TOXINE_PLUGINPATH=`eval echo "$TOXINE_PLUGINDIR"`
AC_DEFINE_UNQUOTED(TOXINE_PLUGINDIR,"$TOXINE_PLUGINPATH",[Define this to plugins directory location])
AC_SUBST(TOXINE_PLUGINPATH)
AC_SUBST(TOXINE_PLUGINDIR)
XINE_PLUGINDIR="`echo $xine_plugin_dir`"
AC_SUBST(XINE_PLUGINDIR)
TOXINE_BINDIR="$bindir"
eval TOXINE_BINPATH=`eval echo "$TOXINE_BINDIR"`
AC_SUBST(TOXINE_BINDIR)
AC_SUBST(TOXINE_BINPATH)
dnl
dnl Some include paths ( !!! DO NOT REMOVE !!! )
dnl
INCLUDES='-I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_srcdir)/readline -I$(top_builddir)/readline -I$(top_srcdir)/src/plugins -I$(top_builddir)/src/plugins $(INTLDIR)'
AC_SUBST(INCLUDES)
dnl
dnl It seems automake 1.5 don't take care about this script
dnl
if test ! -z $am_depcomp; then
DEPCOMP="depcomp"
fi
AC_SUBST(DEPCOMP)
dnl
dnl Output configuration files
dnl
AC_OUTPUT([
Makefile
doc/Makefile
doc/man/Makefile
doc/man/en/Makefile
misc/Makefile
misc/relchk.sh
misc/toxine.spec
misc/dvdplayer.sh
readline/Makefile
m4/Makefile
src/Makefile
src/plugins/Makefile
],[chmod +x ./misc/relchk.sh])
dnl ,[chmod +x ./misc/SlackBuild ./misc/build_rpms.sh])
dnl
dnl Hack the libtool script (if required).
dnl
dnl If user intentionnaly overrided detection, use wish.
if test x"$enable_fpic" != x; then
case "${enable_fpic}" in
yes)
no_fpic="no"
;;
*)
no_fpic="yes"
;;
esac
fi
if test x$no_fpic = "xyes"; then
cat libtool | sed -e 's/^pic_flag=/#pic_flag=/' > libtool-nofpic
else
cat libtool > libtool-nofpic
fi
chmod +x libtool-nofpic
|
|
From: Daniel Caujolle-B. <f1...@us...> - 2003-01-15 17:40:14
|
Update of /cvsroot/toxine/toxine/src/plugins/video_out In directory sc8-pr-cvs1:/tmp/cvs-serv14499/src/plugins/video_out Removed Files: Makefile.am video_out_none.c Log Message: first step of xine API 1.0 port --- Makefile.am DELETED --- --- video_out_none.c DELETED --- |
|
From: Daniel Caujolle-B. <f1...@us...> - 2003-01-15 17:40:14
|
Update of /cvsroot/toxine/toxine/src
In directory sc8-pr-cvs1:/tmp/cvs-serv14499/src
Modified Files:
commands.c
Log Message:
first step of xine API 1.0 port
Index: commands.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/commands.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- commands.c 21 Sep 2002 12:23:56 -0000 1.44
+++ commands.c 15 Jan 2003 17:40:11 -0000 1.45
@@ -450,7 +450,7 @@
while(tox->event.last.type != XINE_EVENT_PLAYBACK_FINISHED) {
xine_usec_sleep(500000.0);
-
+
if(tox->xine_new && tox->xine_open) {
int secs;
@@ -1810,7 +1810,7 @@
tox->playlist.mmk = (mediamark_t **)
realloc(tox->playlist.mmk, sizeof(mediamark_t *) * (tox->playlist.num + 2));
- tox->playlist.mmk[tox->playlist.num + 1] = NULL;
+ tox->playlist.mmk[tox->playlist.num] = NULL;
if(!tox->playlist.num)
tox->playlist.loop = 0;
|
|
From: Daniel Caujolle-B. <f1...@us...> - 2003-01-15 17:40:14
|
Update of /cvsroot/toxine/toxine/src/plugins In directory sc8-pr-cvs1:/tmp/cvs-serv14499/src/plugins Modified Files: Makefile.am Log Message: first step of xine API 1.0 port Index: Makefile.am =================================================================== RCS file: /cvsroot/toxine/toxine/src/plugins/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Makefile.am 20 Sep 2002 22:36:48 -0000 1.5 +++ Makefile.am 15 Jan 2003 17:40:11 -0000 1.6 @@ -1,6 +1,4 @@ -SUBDIRS = video_out - CFLAGS = @CFLAGS@ @X_CFLAGS@ $(AALIB_CFLAGS) DEBUG_CFLAGS = @DEBUG_CFLAGS@ @XINE_CFLAGS@ $(AALIB_CFLAGS) @@ -34,9 +32,6 @@ @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" install-debug: debug - @list='$(SUBDIRS)'; for subdir in $$list; do \ - (cd $$subdir && $(MAKE) $@) || exit;\ - done; @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am mostlyclean-generic: |
|
From: Daniel Caujolle-B. <f1...@us...> - 2003-01-15 17:40:14
|
Update of /cvsroot/toxine/toxine/misc In directory sc8-pr-cvs1:/tmp/cvs-serv14499/misc Modified Files: Makefile.am Removed Files: autogen.sh Log Message: first step of xine API 1.0 port Index: Makefile.am =================================================================== RCS file: /cvsroot/toxine/toxine/misc/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Makefile.am 1 Sep 2002 16:05:30 -0000 1.5 +++ Makefile.am 15 Jan 2003 17:40:11 -0000 1.6 @@ -1,5 +1,5 @@ -EXTRA_DIST = autogen.sh toxine.spec cvs2cl.pl +EXTRA_DIST = toxine.spec cvs2cl.pl bin_SCRIPTS = dvdplayer.sh --- autogen.sh DELETED --- |
|
From: Daniel Caujolle-B. <f1...@us...> - 2003-01-15 17:40:14
|
Update of /cvsroot/toxine/toxine/m4
In directory sc8-pr-cvs1:/tmp/cvs-serv14499/m4
Modified Files:
readline.m4
Log Message:
first step of xine API 1.0 port
Index: readline.m4
===================================================================
RCS file: /cvsroot/toxine/toxine/m4/readline.m4,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- readline.m4 13 May 2002 20:45:37 -0000 1.1.1.1
+++ readline.m4 15 Jan 2003 17:40:11 -0000 1.2
@@ -34,7 +34,7 @@
])
AC_MSG_RESULT($bash_cv_dup2_broken)
if test $bash_cv_dup2_broken = yes; then
-AC_DEFINE(DUP2_BROKEN)
+AC_DEFINE(DUP2_BROKEN,,[Define if dup2 fails to clear the close-on-exec flag])
fi
])
@@ -70,11 +70,11 @@
])
AC_MSG_RESULT($bash_cv_signal_vintage)
if test "$bash_cv_signal_vintage" = posix; then
-AC_DEFINE(HAVE_POSIX_SIGNALS)
+AC_DEFINE(HAVE_POSIX_SIGNALS,,[Define if we have Posix signals])
elif test "$bash_cv_signal_vintage" = "4.2bsd"; then
-AC_DEFINE(HAVE_BSD_SIGNALS)
+AC_DEFINE(HAVE_BSD_SIGNALS,,[Define if we have BSD signals])
elif test "$bash_cv_signal_vintage" = svr3; then
-AC_DEFINE(HAVE_USG_SIGHOLD)
+AC_DEFINE(HAVE_USG_SIGHOLD,,[Define if we have USG SIGHOLD])
fi
])
@@ -137,7 +137,7 @@
])
AC_MSG_RESULT($bash_cv_pgrp_pipe)
if test $bash_cv_pgrp_pipe = yes; then
-AC_DEFINE(PGRP_PIPE)
+AC_DEFINE(PGRP_PIPE,,[Define if whether pgrps need synchronization])
fi
])
@@ -195,9 +195,9 @@
])
AC_MSG_RESULT($bash_cv_type_rlimit)
if test $bash_cv_type_rlimit = quad_t; then
-AC_DEFINE(RLIMTYPE, quad_t)
+AC_DEFINE(RLIMTYPE, quad_t,[Define if RLIMTYPE is quad_t])
elif test $bash_cv_type_rlimit = rlim_t; then
-AC_DEFINE(RLIMTYPE, rlim_t)
+AC_DEFINE(RLIMTYPE, rlim_t,[Define if RLIMTYPE is rlim_t])
fi
])
@@ -217,7 +217,7 @@
[AC_MSG_ERROR(cannot check for _sys_siglist[] if cross compiling -- defaulting to no)])])dnl
AC_MSG_RESULT($bash_cv_decl_under_sys_siglist)
if test $bash_cv_decl_under_sys_siglist = yes; then
-AC_DEFINE(UNDER_SYS_SIGLIST_DECLARED)
+AC_DEFINE(UNDER_SYS_SIGLIST_DECLARED,,[Define if _sys_siglist is in signal.h or unistd.h])
fi
])
@@ -244,7 +244,7 @@
bash_cv_under_sys_siglist=no])])
AC_MSG_RESULT($bash_cv_under_sys_siglist)
if test $bash_cv_under_sys_siglist = yes; then
-AC_DEFINE(HAVE_UNDER_SYS_SIGLIST)
+AC_DEFINE(HAVE_UNDER_SYS_SIGLIST,,[Define if _sys_siglist is in system C library])
fi
])
@@ -271,7 +271,7 @@
bash_cv_sys_siglist=no])])
AC_MSG_RESULT($bash_cv_sys_siglist)
if test $bash_cv_sys_siglist = yes; then
-AC_DEFINE(HAVE_SYS_SIGLIST)
+AC_DEFINE(HAVE_SYS_SIGLIST,,[Define sys_siglist is in system C library])
fi
])
@@ -286,7 +286,7 @@
bash_cv_sys_errlist=yes, bash_cv_sys_errlist=no)])dnl
AC_MSG_RESULT($bash_cv_sys_errlist)
if test $bash_cv_sys_errlist = yes; then
-AC_DEFINE(HAVE_SYS_ERRLIST)
+AC_DEFINE(HAVE_SYS_ERRLIST,,[Define if sys_errlist and sys_nerr were found])
fi
])
@@ -333,7 +333,7 @@
)])
AC_MSG_RESULT($bash_cv_opendir_not_robust)
if test $bash_cv_opendir_not_robust = yes; then
-AC_DEFINE(OPENDIR_NOT_ROBUST)
+AC_DEFINE(OPENDIR_NOT_ROBUST,,[Define if opendir() does not opens non-directories])
fi
])
@@ -353,7 +353,7 @@
[int i;], bash_cv_void_sighandler=yes, bash_cv_void_sighandler=no)])dnl
AC_MSG_RESULT($bash_cv_void_sighandler)
if test $bash_cv_void_sighandler = yes; then
-AC_DEFINE(VOID_SIGHANDLER)
+AC_DEFINE(VOID_SIGHANDLER,,[Define if signal handlers are of type void])
fi
])
@@ -387,9 +387,9 @@
fi
AC_MSG_RESULT($bash_cv_type_int32_t);
if test "$bash_cv_type_int32_t" = "int"; then
-AC_DEFINE(int32_t, int)
+AC_DEFINE(int32_t, int,[Define if type int is 32 bits wide])
else
-AC_DEFINE(int32_t, long)
+AC_DEFINE(int32_t, long,[Define if type long is 32 bits wide])
fi
])
@@ -423,9 +423,9 @@
fi
AC_MSG_RESULT($bash_cv_type_u_int32_t);
if test "$bash_cv_type_u_int32_t" = "int"; then
-AC_DEFINE(u_int32_t, unsigned int)
+AC_DEFINE(u_int32_t, unsigned int,[Define if unsigned int is 32 bits wide])
else
-AC_DEFINE(u_int32_t, unsigned long)
+AC_DEFINE(u_int32_t, unsigned long,[Define if unsigned long is 32 bits wide])
fi
])
@@ -459,9 +459,9 @@
fi
AC_MSG_RESULT($bash_cv_type_ptrdiff_t);
if test "$bash_cv_type_ptrdiff_t" = "int"; then
-AC_DEFINE(ptrdiff_t, int)
+AC_DEFINE(ptrdiff_t, int,[Define if type int is correct for ptrdiff_t])
else
-AC_DEFINE(ptrdiff_t, long)
+AC_DEFINE(ptrdiff_t, long,[Define if type long is correct for ptrdiff_t])
fi
])
@@ -474,7 +474,7 @@
bash_cv_have_strsignal=yes, bash_cv_have_strsignal=no)])
AC_MSG_RESULT($bash_cv_have_strsignal)
if test $bash_cv_have_strsignal = yes; then
-AC_DEFINE(HAVE_STRSIGNAL)
+AC_DEFINE(HAVE_STRSIGNAL,,[Define if the existence of strsignal])
fi
])
@@ -488,7 +488,7 @@
],[ lstat(".",(struct stat *)0); ],
bash_cv_func_lstat=yes, bash_cv_func_lstat=no)])
if test $bash_cv_func_lstat = yes; then
- AC_DEFINE(HAVE_LSTAT)
+ AC_DEFINE(HAVE_LSTAT,,[Define if have lstat])
fi
])
@@ -500,7 +500,7 @@
bash_cv_termios_ldisc=yes, bash_cv_termios_ldisc=no)])dnl
AC_MSG_RESULT($bash_cv_termios_ldisc)
if test $bash_cv_termios_ldisc = yes; then
-AC_DEFINE(TERMIOS_LDISC)
+AC_DEFINE(TERMIOS_LDISC,,[Define if we have a c_line member of struct termios])
fi
])
@@ -512,7 +512,7 @@
bash_cv_termio_ldisc=yes, bash_cv_termio_ldisc=no)])dnl
AC_MSG_RESULT($bash_cv_termio_ldisc)
if test $bash_cv_termio_ldisc = yes; then
-AC_DEFINE(TERMIO_LDISC)
+AC_DEFINE(TERMIO_LDISC,,[Define if we ahve a c_line member of struct termio])
fi
])
@@ -556,7 +556,7 @@
)])
AC_MSG_RESULT($bash_cv_getenv_redef)
if test $bash_cv_getenv_redef = yes; then
-AC_DEFINE(CAN_REDEFINE_GETENV)
+AC_DEFINE(CAN_REDEFINE_GETENV,,[Define if getenv can be redefined])
fi
])
@@ -582,7 +582,7 @@
)])
AC_MSG_RESULT($bash_cv_printf_declared)
if test $bash_cv_printf_declared = yes; then
-AC_DEFINE(PRINTF_DECLARED)
+AC_DEFINE(PRINTF_DECLARED,,[Define if declaration of printf is present in <stdio.h>])
fi
])
@@ -601,7 +601,7 @@
)])
AC_MSG_RESULT($bash_cv_ulimit_maxfds)
if test $bash_cv_ulimit_maxfds = yes; then
-AC_DEFINE(ULIMIT_MAXFDS)
+AC_DEFINE(ULIMIT_MAXFDS,,[Define if ulimit can be substituted for getdtablesize])
fi
])
@@ -733,7 +733,7 @@
)])
AC_MSG_RESULT($bash_cv_getcwd_calls_popen)
if test $bash_cv_getcwd_calls_popen = yes; then
-AC_DEFINE(GETCWD_BROKEN)
+AC_DEFINE(GETCWD_BROKEN,,[Define if getcwd() calls popen()])
fi
])
@@ -766,7 +766,7 @@
], bash_cv_dirent_has_dino=yes, bash_cv_dirent_has_dino=no)])
AC_MSG_RESULT($bash_cv_dirent_has_dino)
if test $bash_cv_dirent_has_dino = yes; then
-AC_DEFINE(STRUCT_DIRENT_HAS_D_INO)
+AC_DEFINE(STRUCT_DIRENT_HAS_D_INO,,[Define if struct dirent has a d_ino member])
fi
])
@@ -799,7 +799,7 @@
], bash_cv_dirent_has_d_fileno=yes, bash_cv_dirent_has_d_fileno=no)])
AC_MSG_RESULT($bash_cv_dirent_has_d_fileno)
if test $bash_cv_dirent_has_d_fileno = yes; then
-AC_DEFINE(STRUCT_DIRENT_HAS_D_FILENO)
+AC_DEFINE(STRUCT_DIRENT_HAS_D_FILENO,,[Define if struct dirent has a d_fileno member])
fi
])
@@ -857,7 +857,7 @@
)])
AC_MSG_RESULT($bash_cv_must_reinstall_sighandlers)
if test $bash_cv_must_reinstall_sighandlers = yes; then
-AC_DEFINE(MUST_REINSTALL_SIGHANDLERS)
+AC_DEFINE(MUST_REINSTALL_SIGHANDLERS,,[Define if signal handlers must be reinstalled when invoked])
fi
])
@@ -868,7 +868,7 @@
bash_cv_sbrk_declared=yes, bash_cv_sbrk_declared=no)])
AC_MSG_RESULT($bash_cv_sbrk_declared)
if test $bash_cv_sbrk_declared = yes; then
-AC_DEFINE(SBRK_DECLARED)
+AC_DEFINE(SBRK_DECLARED,,[Define if declaration of sbrk is in <unistd.h>])
fi
])
@@ -926,7 +926,7 @@
)])
AC_MSG_RESULT($bash_cv_job_control_missing)
if test $bash_cv_job_control_missing = missing; then
-AC_DEFINE(JOB_CONTROL_MISSING)
+AC_DEFINE(JOB_CONTROL_MISSING,,[Define if there is the presence of necessary job control definitions])
fi
])
@@ -971,7 +971,7 @@
)])
AC_MSG_RESULT($bash_cv_sys_named_pipes)
if test $bash_cv_sys_named_pipes = missing; then
-AC_DEFINE(NAMED_PIPES_MISSING)
+AC_DEFINE(NAMED_PIPES_MISSING,,[Define if named pipes are not found])
fi
])
@@ -1022,7 +1022,7 @@
)])
AC_MSG_RESULT($bash_cv_func_sigsetjmp)
if test $bash_cv_func_sigsetjmp = present; then
-AC_DEFINE(HAVE_POSIX_SIGSETJMP)
+AC_DEFINE(HAVE_POSIX_SIGSETJMP,,[Define if POSIX-style sigsetjmp/siglongjmp is found])
fi
])
@@ -1034,7 +1034,7 @@
bash_cv_tiocgwinsz_in_ioctl=yes,bash_cv_tiocgwinsz_in_ioctl=no)])
AC_MSG_RESULT($bash_cv_tiocgwinsz_in_ioctl)
if test $bash_cv_tiocgwinsz_in_ioctl = yes; then
-AC_DEFINE(GWINSZ_IN_SYS_IOCTL)
+AC_DEFINE(GWINSZ_IN_SYS_IOCTL,,[Define if TIOCGWINSZ is in sys/ioctl.h])
fi
])
@@ -1050,10 +1050,10 @@
])])
if test $bash_cv_struct_winsize_header = ioctl_h; then
AC_MSG_RESULT(sys/ioctl.h)
- AC_DEFINE(STRUCT_WINSIZE_IN_SYS_IOCTL)
+ AC_DEFINE(STRUCT_WINSIZE_IN_SYS_IOCTL,,[Define if struct winsize is in sys/ioctl.h])
elif test $bash_cv_struct_winsize_header = termios_h; then
AC_MSG_RESULT(termios.h)
- AC_DEFINE(STRUCT_WINSIZE_IN_TERMIOS)
+ AC_DEFINE(STRUCT_WINSIZE_IN_TERMIOS,,[Define if struct winsize is in termios.h])
else
AC_MSG_RESULT(not found)
fi
@@ -1067,7 +1067,7 @@
bash_cv_tiocstat_in_ioctl=yes,bash_cv_tiocstat_in_ioctl=no)])
AC_MSG_RESULT($bash_cv_tiocstat_in_ioctl)
if test $bash_cv_tiocstat_in_ioctl = yes; then
-AC_DEFINE(TIOCSTAT_IN_SYS_IOCTL)
+AC_DEFINE(TIOCSTAT_IN_SYS_IOCTL,,[Define if TIOCSTAT is in sys/ioctl.h])
fi
])
@@ -1079,7 +1079,7 @@
bash_cv_fionread_in_ioctl=yes,bash_cv_fionread_in_ioctl=no)])
AC_MSG_RESULT($bash_cv_fionread_in_ioctl)
if test $bash_cv_fionread_in_ioctl = yes; then
-AC_DEFINE(FIONREAD_IN_SYS_IOCTL)
+AC_DEFINE(FIONREAD_IN_SYS_IOCTL,,[Define if FIONREAD is in sys/ioctl.h])
fi
])
@@ -1096,7 +1096,7 @@
bash_cv_speed_t_in_sys_types=yes,bash_cv_speed_t_in_sys_types=no)])
AC_MSG_RESULT($bash_cv_speed_t_in_sys_types)
if test $bash_cv_speed_t_in_sys_types = yes; then
-AC_DEFINE(SPEED_T_IN_SYS_TYPES)
+AC_DEFINE(SPEED_T_IN_SYS_TYPES,,[Define if speed_t is in sys/types.h])
fi
])
@@ -1111,8 +1111,8 @@
[struct passwd *z; z = getpwent(); z = getpwuid(0); z = getpwnam("root");],
bash_cv_can_redecl_getpw=yes,bash_cv_can_redecl_getpw=no)])
AC_MSG_RESULT($bash_cv_can_redecl_getpw)
-if test $bash_cv_can_redecl_getpw = no; then
-AC_DEFINE(HAVE_GETPW_DECLS)
+if test x"$bash_cv_can_redecl_getpw" = "xno"; then
+AC_DEFINE(HAVE_GETPW_DECLS,,[Declare if problems are able to redeclare gepw functions])
fi
])
@@ -1129,11 +1129,11 @@
])
AC_MSG_RESULT($bash_cv_dev_fd)
if test $bash_cv_dev_fd = "standard"; then
- AC_DEFINE(HAVE_DEV_FD)
- AC_DEFINE(DEV_FD_PREFIX, "/dev/fd/")
+ AC_DEFINE(HAVE_DEV_FD,,[Define if /dev/fd is available])
+ AC_DEFINE(DEV_FD_PREFIX, "/dev/fd/",[Define floppy drive prefix])
elif test $bash_cv_dev_fd = "whacky"; then
- AC_DEFINE(HAVE_DEV_FD)
- AC_DEFINE(DEV_FD_PREFIX, "/proc/self/fd/")
+ AC_DEFINE(HAVE_DEV_FD,,[Define if /dev/fd is /proc/self/fd])
+ AC_DEFINE(DEV_FD_PREFIX, "/proc/self/fd/",[Define floppy drive prefix])
fi
])
@@ -1179,8 +1179,8 @@
else
LIBS="-lsocket $LIBS"
fi
- AC_DEFINE(HAVE_LIBSOCKET)
- AC_DEFINE(HAVE_GETPEERNAME)
+ AC_DEFINE(HAVE_LIBSOCKET,,[Define if libsocket is found])
+ AC_DEFINE(HAVE_GETPEERNAME,,[Define if getpeername is found])
fi
])
@@ -1201,15 +1201,15 @@
])
AC_MSG_RESULT($bash_cv_mail_dir)
if test $bash_cv_mail_dir = "/var/mail"; then
- AC_DEFINE(DEFAULT_MAIL_DIRECTORY, "/var/mail")
+ AC_DEFINE(DEFAULT_MAIL_DIRECTORY, "/var/mail",[Define default mail directory])
elif test $bash_cv_mail_dir = "/usr/mail"; then
- AC_DEFINE(DEFAULT_MAIL_DIRECTORY, "/usr/mail")
+ AC_DEFINE(DEFAULT_MAIL_DIRECTORY, "/usr/mail",[Define default mail directory])
elif test $bash_cv_mail_dir = "/var/spool/mail"; then
- AC_DEFINE(DEFAULT_MAIL_DIRECTORY, "/var/spool/mail")
+ AC_DEFINE(DEFAULT_MAIL_DIRECTORY, "/var/spool/mail",[Define default mail directory])
elif test $bash_cv_mail_dir = "/usr/spool/mail"; then
- AC_DEFINE(DEFAULT_MAIL_DIRECTORY, "/usr/spool/mail")
+ AC_DEFINE(DEFAULT_MAIL_DIRECTORY, "/usr/spool/mail",[Define default mail directory])
else
- AC_DEFINE(DEFAULT_MAIL_DIRECTORY, "unknown")
+ AC_DEFINE(DEFAULT_MAIL_DIRECTORY, "unknown",[Define default mail directory])
fi
])
@@ -1240,7 +1240,7 @@
)])
AC_MSG_RESULT($bash_cv_kernel_rlimit)
if test $bash_cv_kernel_rlimit = yes; then
-AC_DEFINE(RLIMIT_NEEDS_KERNEL)
+AC_DEFINE(RLIMIT_NEEDS_KERNEL,,[Define if $host_os needs _KERNEL for RLIMIT defines])
fi
])
@@ -1289,7 +1289,7 @@
)])
AC_MSG_RESULT($bash_cv_func_strcoll_broken)
if test $bash_cv_func_strcoll_broken = yes; then
-AC_DEFINE(STRCOLL_BROKEN)
+AC_DEFINE(STRCOLL_BROKEN,,[Define if strcoll and strcmp differ])
fi
])
@@ -1377,6 +1377,6 @@
AC_MSG_ERROR(cannot check restartable syscalls if cross compiling))
])
if test $bash_cv_sys_restartable_syscalls = yes; then
- AC_DEFINE(HAVE_RESTARTABLE_SYSCALLS)
+ AC_DEFINE(HAVE_RESTARTABLE_SYSCALLS,,[Define if restarted system calls after a signal handler has been installed with signal()])
fi
])
|
|
From: Daniel Caujolle-B. <f1...@us...> - 2003-01-15 17:40:13
|
Update of /cvsroot/toxine/toxine
In directory sc8-pr-cvs1:/tmp/cvs-serv14499
Added Files:
autogen.sh
Removed Files:
acconfig.h configure.in cvscompile.sh
Log Message:
first step of xine API 1.0 port
--- NEW FILE: autogen.sh ---
#!/bin/sh
#
# Copyright (C) 2000-2003 the xine project
#
# This file is part of xine, a unix video player.
#
# xine is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# xine is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
#
# $Id: autogen.sh,v 1.1 2003/01/15 17:40:10 f1rmb Exp $
#
# Wrote by Stephen Torri <st...@us...>
# Stolen by me from xine-ui.
#
# run this to generate all the initial makefiles, etc.
PROG=toxine
# Minimum value required to build
AUTOMAKE_MIN=1.6.0
AUTOCONF_MIN=2.53
LIBTOOL_MIN=1.4.0
# Check how echo works in this /bin/sh
case `echo -n` in
-n) _echo_n= _echo_c='\c';;
*) _echo_n=-n _echo_c=;;
esac
detect_configure_ac() {
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
(test -f $srcdir/configure.ac) || {
echo $_echo_n "*** Error ***: Directory "\`$srcdir\`" does not look like the"
echo " top-level directory"
exit 1
}
}
#--------------------
# AUTOCONF
#-------------------
detect_autoconf() {
set -- `type autoconf 2>/dev/null`
RETVAL=$?
NUM_RESULT=$#
RESULT_FILE=$3
if [ $RETVAL -eq 0 -a $NUM_RESULT -eq 3 -a -f "$RESULT_FILE" ]; then
AC="`autoconf --version | sed -n 1p | sed -e 's/[a-zA-Z\ \.\(\)\-]//g'`"
AUTOCONF_MIN="`echo $AUTOCONF_MIN | sed -e 's/[a-zA-Z\ \.\(\)\-]//g'`"
if test $AC -lt 100 ; then
AC=`expr $AC \* 10`
fi
if [ `expr $AC` -ge $AUTOCONF_MIN ]; then
autoconf_ok=yes
fi
else
echo
echo "**Error**: You must have \`autoconf' >= $AUTOCONF_MIN installed to"
echo " compile $PROG. Download the appropriate package"
echo " for your distribution or source from ftp.gnu.org."
exit 1
fi
}
run_autoheader () {
if test x"$autoconf_ok" != x"yes"; then
echo
echo "**Warning**: Version of autoconf is less than $AUTOCONF_MIN."
echo " Some warning message might occur from autoconf"
echo
fi
echo $_echo_n " + Running autoheader: $_echo_c";
autoheader;
echo "done."
}
run_autoconf () {
if test x"$autoconf_ok" != x"yes"; then
echo
echo "**Warning**: Version of autoconf is less than $AUTOCONF_MIN."
echo " Some warning message might occur from autoconf"
echo
fi
echo $_echo_n " + Running autoconf: $_echo_c";
autoconf;
echo "done."
}
#--------------------
# LIBTOOL
#-------------------
detect_libtool() {
set -- `type libtool 2>/dev/null`
RETVAL=$?
NUM_RESULT=$#
RESULT_FILE=$3
if [ $RETVAL -eq 0 -a $NUM_RESULT -eq 3 -a -f "$RESULT_FILE" ]; then
LT="`libtool --version | awk '{ print $4 }' | sed -e 's/[a-zA-Z\ \.\(\)\-]//g'`"
LIBTOOL_MIN="`echo $LIBTOOL_MIN | sed -e 's/[a-zA-Z\ \.\(\)\-]//g'`"
if test $LT -lt 100 ; then
LT=`expr $LT \* 10`
fi
if [ `expr $LT` -ge $LIBTOOL_MIN ]; then
libtool_ok=yes
fi
else
echo
echo "**Error**: You must have \`libtool' >= $LIBTOOL_MIN installed to"
echo " compile $PROG. Download the appropriate package"
echo " for your distribution or source from ftp.gnu.org."
exit 1
fi
}
run_libtoolize() {
if test x"$libtool_ok" != x"yes"; then
echo
echo "**Warning**: Version of libtool is less than $LIBTOOL_MIN."
echo " Some warning message might occur from libtool"
echo
fi
echo $_echo_n " + Running libtoolize: $_echo_c";
libtoolize --force --copy >/dev/null 2>&1;
echo "done."
}
#--------------------
# AUTOMAKE
#--------------------
detect_automake() {
#
# expected output from 'type' is
# automake is /usr/local/bin/automake
#
set -- `type automake 2>/dev/null`
RETVAL=$?
NUM_RESULT=$#
RESULT_FILE=$3
if [ $RETVAL -eq 0 -a $NUM_RESULT -eq 3 -a -f "$RESULT_FILE" ]; then
AM="`automake --version | sed -n 1p | sed -e 's/[a-zA-Z\ \.\(\)\-]//g'`"
AUTOMAKE_MIN="`echo $AUTOMAKE_MIN | sed -e 's/[a-zA-Z\ \.\(\)\-]//g'`"
if test $AM -lt 100 ; then
AM=`expr $AM \* 10`
fi
if [ `expr $AM` -ge $AUTOMAKE_MIN ]; then
automake_ok=yes
fi
else
echo
echo "**Error**: You must have \`automake' >= $AUTOMAKE_MIN installed to"
echo " compile $PROG. Download the appropriate package"
echo " for your distribution or source from ftp.gnu.org."
exit 1
fi
}
run_automake () {
if test x"$automake_ok" != x"yes"; then
echo
echo "**Warning**: Version of automake is less than $AUTOMAKE_MIN."
echo " Some warning message might occur from automake"
echo
fi
echo $_echo_n " + Running automake: $_echo_c";
automake --gnu --add-missing --copy;
echo "done."
}
#--------------------
# ACLOCAL
#-------------------
detect_aclocal() {
# if no automake, don't bother testing for aclocal
set -- `type aclocal 2>/dev/null`
RETVAL=$?
NUM_RESULT=$#
RESULT_FILE=$3
if [ $RETVAL -eq 0 -a $NUM_RESULT -eq 3 -a -f "$RESULT_FILE" ]; then
AC="`aclocal --version | sed -n 1p | sed -e 's/[a-zA-Z\ \.\(\)\-]//g'`"
ACLOCAL_MIN="`echo $AUTOMAKE_MIN | sed -e 's/[a-zA-Z\ \.\(\)\-]//g'`"
if test $AC -lt 100 ; then
AC=`expr $AC \* 10`
fi
if [ `expr $AC` -ge $ACLOCAL_MIN ]; then
aclocal_ok=yes
fi
else
echo
echo "**Error**: You must have \`automake' >= $AUTOMAKE_MIN installed to"
echo " compile $PROG. Download the appropriate package"
echo " for your distribution or source from ftp.gnu.org."
exit 1
fi
}
run_aclocal () {
if test x"$aclocal_ok" != x"yes"; then
echo
echo "**Warning**: Version of aclocal is less than $AUTOMAKE_MIN."
echo " Some warning message might occur from aclocal"
echo
fi
echo $_echo_n " + Running aclocal: $_echo_c"
aclocalinclude=`xine-config --acflags`
aclocal $aclocalinclude -I m4
echo "done."
}
#--------------------
# CONFIGURE
#-------------------
run_configure () {
rm -f config.cache
echo " + Running 'configure $@':"
if [ -z "$*" ]; then
echo " ** If you wish to pass arguments to ./configure, please"
echo " ** specify them on the command line."
fi
./configure "$@"
}
#---------------
# MAIN
#---------------
detect_configure_ac
detect_autoconf
detect_libtool
detect_automake
detect_aclocal
# help: print out usage message
# *) run aclocal, autoheader, automake, autoconf, configure
case "$1" in
aclocal)
run_aclocal
;;
autoheader)
run_autoheader
;;
automake)
run_aclocal
run_automake
;;
autoconf)
run_aclocal
run_autoconf
;;
libtoolize)
run_libtoolize
;;
noconfig)
run_aclocal
run_libtoolize
run_autoheader
run_automake
run_autoconf
;;
*)
run_aclocal
run_libtoolize
run_autoheader
run_automake
run_autoconf
run_configure $@
;;
esac
--- acconfig.h DELETED ---
--- configure.in DELETED ---
--- cvscompile.sh DELETED ---
|
|
From: Daniel Caujolle-B. <f1...@us...> - 2002-09-21 12:23:58
|
Update of /cvsroot/toxine/toxine/src
In directory usw-pr-cvs1:/tmp/cvs-serv2429/src
Modified Files:
commands.c utils.c xine_commands.c xine_commands.h
Log Message:
Sync to latest xine config functions renaming. Add new xine_get_version_string.
Index: commands.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/commands.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- commands.c 21 Sep 2002 00:07:29 -0000 1.43
+++ commands.c 21 Sep 2002 12:23:56 -0000 1.44
@@ -1407,7 +1407,8 @@
pinfo("Built with xine library %d.%d.%d (%s).\n",
XINE_MAJOR_VERSION, XINE_MINOR_VERSION, XINE_SUB_VERSION, XINE_VERSION);
xine_get_version(&major, &minor, &sub);
- pinfo("Found xine library version: %d.%d.%d.\n", major, minor, sub);
+ pinfo("Found xine library version: %d.%d.%d (%s).\n",
+ major, minor, sub, xine_get_version_string());
pinfo("Using readline version %s.\n", rl_library_version);
pinfo(".\n");
}
Index: utils.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/utils.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- utils.c 21 Sep 2002 00:07:29 -0000 1.15
+++ utils.c 21 Sep 2002 12:23:56 -0000 1.16
@@ -621,12 +621,12 @@
void toxine_config_load(toxine_t *tox) {
if(tox)
- xine_load_config(tox->xine, tox->configfile);
+ xine_config_load(tox->xine, tox->configfile);
}
void toxine_config_save(toxine_t *tox) {
if(tox) {
return_if_no_new(tox);
- xine_save_config(tox->xine, tox->configfile);
+ xine_config_save(tox->xine, tox->configfile);
}
}
Index: xine_commands.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/xine_commands.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- xine_commands.c 21 Sep 2002 00:21:19 -0000 1.28
+++ xine_commands.c 21 Sep 2002 12:23:56 -0000 1.29
@@ -466,8 +466,8 @@
tox->xine_new = (tox->xine) ? 1 : 0;
toxine_set_last_int_result(tox, (int)tox->xine);
pinfo("0x%x\n", (int)tox->xine);
- pinfo("xine_load_config()\n");
- xine_load_config(tox->xine, tox->configfile);
+ pinfo("xine_config_load()\n");
+ xine_config_load(tox->xine, tox->configfile);
pinfo("\n");
}
@@ -1777,7 +1777,7 @@
perr("Argument(s) missing.\n");
}
-void _xine_load_config(commands_t *command, toxine_t *tox, void *data) {
+void _xine_config_load(commands_t *command, toxine_t *tox, void *data) {
const char *filename = NULL;
return_if_no_new(tox);
@@ -1789,13 +1789,13 @@
tox->configfile = strdup(filename);
}
- pinfo("xine_load_config(%s):\n", tox->configfile);
- xine_load_config(tox->xine, tox->configfile);
+ pinfo("xine_config_load(%s):\n", tox->configfile);
+ xine_config_load(tox->xine, tox->configfile);
pinfo(".\n");
pinfo("\n");
}
-void _xine_save_config(commands_t *command, toxine_t *tox, void *data) {
+void _xine_config_save(commands_t *command, toxine_t *tox, void *data) {
const char *filename = NULL;
return_if_no_new(tox);
@@ -1803,17 +1803,17 @@
if(toxine_is_args(tox))
filename = toxine_get_arg(tox, 1);
- pinfo("xine_save_config(%s):\n", (filename) ? filename : tox->configfile);
- xine_save_config(tox->xine, ((filename) ? filename : tox->configfile));
+ pinfo("xine_config_save(%s):\n", (filename) ? filename : tox->configfile);
+ xine_config_save(tox->xine, ((filename) ? filename : tox->configfile));
pinfo(".\n");
pinfo("\n");
}
-void _xine_reset_config(commands_t *command, toxine_t *tox, void *data) {
+void _xine_config_reset(commands_t *command, toxine_t *tox, void *data) {
return_if_no_new(tox);
- pinfo("xine_reset_config():\n");
- xine_reset_config(tox->xine);
+ pinfo("xine_config_reset():\n");
+ xine_config_reset(tox->xine);
pinfo(".\n");
pinfo("\n");
@@ -1834,6 +1834,20 @@
// toxine_set_last_int_result(tox, version);
poutalign();
pout("'%d.%d.%d'\n", major, minor, sub);
+ pinfo(".\n");
+}
+
+/*
+ *
+ */
+void _xine_get_version_string(commands_t *command, toxine_t *tox, void *data) {
+ const char *result;
+
+ pinfo("xine_get_version_string():\n");
+ result = xine_get_version_string();
+ toxine_set_last_char_result(tox, result);
+ poutalign();
+ pout("'%s'\n", result);
pinfo(".\n");
}
Index: xine_commands.h
===================================================================
RCS file: /cvsroot/toxine/toxine/src/xine_commands.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xine_commands.h 20 Sep 2002 23:48:06 -0000 1.16
+++ xine_commands.h 21 Sep 2002 12:23:56 -0000 1.17
@@ -53,10 +53,11 @@
void _xine_config_get_next_entry(commands_t *, toxine_t *, void *);
void _xine_config_lookup_entry(commands_t *, toxine_t *, void *);
void _xine_config_update_entry(commands_t *, toxine_t *, void *);
-void _xine_load_config(commands_t *, toxine_t *, void *);
-void _xine_save_config(commands_t *, toxine_t *, void *);
-void _xine_reset_config(commands_t *, toxine_t *, void *);
+void _xine_config_load(commands_t *, toxine_t *, void *);
+void _xine_config_save(commands_t *, toxine_t *, void *);
+void _xine_config_reset(commands_t *, toxine_t *, void *);
void _xine_get_version(commands_t *, toxine_t *, void *);
+void _xine_get_version_string(commands_t *, toxine_t *, void *);
void _xine_check_version(commands_t *, toxine_t *, void *);
/////////////////////
@@ -292,21 +293,25 @@
"Update value of specified entry.", \
"_xine_config_update_entry <key> <value>" \
}, \
- { "xine_load_config", OPTIONAL_ARGS, _xine_load_config, \
+ { "xine_config_load", OPTIONAL_ARGS, _xine_config_load, \
"Load a config file (filename is optional).", \
- "xine_load_config [filename]" \
+ "xine_config_load [filename]" \
}, \
- { "xine_save_config", OPTIONAL_ARGS, _xine_save_config, \
+ { "xine_config_save", OPTIONAL_ARGS, _xine_config_save, \
"Save a config file (filename is optional).", \
- "xine_save_config [filename]" \
+ "xine_config_save [filename]" \
}, \
- { "xine_reset_config", NO_ARGS, _xine_reset_config, \
+ { "xine_config_reset", NO_ARGS, _xine_config_reset, \
"Reset the config object.", \
- "xine_reset_config" \
+ "xine_config_reset" \
}, \
{ "xine_get_version", NO_ARGS, _xine_get_version, \
"Get major/minor/sub version numbers.", \
"xine_get_version" \
+ }, \
+ { "xine_get_version_string", NO_ARGS, _xine_get_version_string, \
+ "Get version string.", \
+ "xine_get_version_string" \
}, \
{ "xine_check_version", REQUIRE_ARGS, _xine_check_version, \
"Compare version numbers with xine installed version.", \
|
|
From: Daniel Caujolle-B. <f1...@us...> - 2002-09-21 00:21:25
|
Update of /cvsroot/toxine/toxine/src
In directory usw-pr-cvs1:/tmp/cvs-serv25781
Modified Files:
xine_commands.c
Log Message:
Fix wrong reported time using xine_get_pos_length().
Index: xine_commands.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/xine_commands.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- xine_commands.c 20 Sep 2002 23:54:21 -0000 1.27
+++ xine_commands.c 21 Sep 2002 00:21:19 -0000 1.28
@@ -1194,19 +1194,22 @@
*/
void _xine_get_pos_length(commands_t *command, toxine_t *tox, void *data) {
int result, stream, time, length;
+ int stime, slength;
return_if_no_init(tox);
return_if_no_open(tox);
pinfo("xine_get_pos_length():\n");
- result = xine_get_pos_length (tox->xine, &stream, &time, &length);
+ result = xine_get_pos_length (tox->xine, &stream, &time, &length);
+ stime = time / 1000;
+ slength = length / 1000;
toxine_draw_bar("", 0, length, time);
pinfo("position:\n");
pinfo("Stream %d (0...65535), "
"time %02d:%02d:%02d (%dms).\n",
- stream, time / (60 * 60), (time / 60) % 60, time % 60, time);
+ stream, stime / (60 * 60), (stime / 60) % 60, stime % 60, time);
pinfo("Total time: %02d:%02d:%02d (%dms)\n",
- length / (60 * 60), (length / 60) % 60, length % 60, length);
+ slength / (60 * 60), (slength / 60) % 60, slength % 60, length);
pinfo("\n");
}
|
|
From: Daniel Caujolle-B. <f1...@us...> - 2002-09-21 00:07:34
|
Update of /cvsroot/toxine/toxine/src
In directory usw-pr-cvs1:/tmp/cvs-serv23153
Modified Files:
commands.c common.h main.c parse.c playlist.c sortcmds.c
utils.c
Log Message:
rename _FREE macro. Fix a segfault on exiting.
Index: commands.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/commands.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- commands.c 20 Sep 2002 23:48:06 -0000 1.42
+++ commands.c 21 Sep 2002 00:07:29 -0000 1.43
@@ -840,7 +840,7 @@
}
- _FREE(tox->command.line);
+ toxine_free(tox->command.line);
} while((tox->command.remain != NULL));
}
@@ -1002,7 +1002,7 @@
}
}
- _FREE(grabbed_line);
+ toxine_free(grabbed_line);
}
toxine_update_prompt(tox);
@@ -1011,7 +1011,7 @@
}
/* deinit video_out plugin */
- if(tox->xine) {
+ if(tox->xine_init) {
if(tox->playlist.thread_num > 0) {
void *v;
@@ -1777,7 +1777,7 @@
for(; tox->playlist.num > 0;)
playlist_free_entry(tox, (tox->playlist.num - 1));
- _FREE(tox->playlist.mmk);
+ toxine_free(tox->playlist.mmk);
tox->playlist.num = 0;
tox->playlist.cur = -1;
@@ -2153,7 +2153,7 @@
for(; tox->playlist.num > 0;)
playlist_free_entry(tox, (tox->playlist.num - 1));
- _FREE(tox->playlist.mmk);
+ toxine_free(tox->playlist.mmk);
tox->playlist.num = 0;
tox->playlist.cur = -1;
Index: common.h
===================================================================
RCS file: /cvsroot/toxine/toxine/src/common.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- common.h 19 Sep 2002 21:04:06 -0000 1.17
+++ common.h 21 Sep 2002 00:07:29 -0000 1.18
@@ -40,13 +40,6 @@
#define __tox_func__ __FUNCTION__
#endif
-#define _FREE(x) do { \
- if(x) { \
- free(x); \
- x = NULL; \
- } \
- } while(0)
-
#define INFO_PREFIX " (I) "
#define HELP_PREFIX " (?) "
#define ECHO_PREFIX " (e) "
@@ -57,6 +50,13 @@
#define PLAYLIST_LOOP 0
#define PLAYLIST_MRL_LOOP 1
+#define toxine_free(x) do { \
+ if((x)) { \
+ free((x)); \
+ x = NULL; \
+ } \
+ } while(0)
+
#define poutalign() do { \
fprintf(stdout, "%s", EMPTY_PREFIX); \
fflush(stdout); \
@@ -88,18 +88,6 @@
fprintf(stdout, FMT, ##ARGS); \
fflush(stdout); \
} while(0)
-
-#if 0
-#define CHECK_XINE(x) do { \
- if((x->xine_new != 1) || \
- (x->xine == NULL) || \
- (x->xine_init != 1)) { \
- perr("%s(): The xine engine isn't initialized. Do it first.\n", \
- __tox_func__); \
- return; \
- } \
- } while(0)
-#endif
#define return_if_no_init(x) do { \
if(((x)->xine == NULL) || ((x)->xine_init != 1)) { \
Index: main.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/main.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- main.c 19 Sep 2002 21:04:06 -0000 1.18
+++ main.c 21 Sep 2002 00:07:29 -0000 1.19
@@ -100,7 +100,7 @@
/*
* Freeing allocated memory.
*/
-static void toxine_free(toxine_t *tox) {
+static void toxine_release(toxine_t *tox) {
int i;
#warning FIXME
@@ -115,25 +115,25 @@
for(; tox->playlist.num > 0;)
playlist_free_entry(tox, (tox->playlist.num - 1));
- _FREE(tox->playlist.mmk);
+ toxine_free(tox->playlist.mmk);
}
- _FREE(tox->configfile);
- _FREE((char *)tox->video.name);
- _FREE((char *)tox->audio.name);
- _FREE(tox->command.line);
- _FREE(tox->command.remain);
- _FREE(tox->command.command);
- _FREE(tox->last_result);
+ toxine_free(tox->configfile);
+ toxine_free((char *)tox->video.name);
+ toxine_free((char *)tox->audio.name);
+ toxine_free(tox->command.line);
+ toxine_free(tox->command.remain);
+ toxine_free(tox->command.command);
+ toxine_free(tox->last_result);
for(i = 0; i < 256; i++)
- _FREE(tox->command.args[i]);
+ toxine_free(tox->command.args[i]);
- _FREE(tox->script.filename);
+ toxine_free(tox->script.filename);
pthread_mutex_destroy(&tox->event.mutex);
- _FREE(tox);
+ toxine_free(tox);
}
}
@@ -247,7 +247,7 @@
if(tox->msg_fd >= 0) {
if((!tox->script.in_use) && (!tox->command.execute)) {
fprintf(stderr, "You can't use message redirection in prompt mode.\n");
- toxine_free(tox);
+ toxine_release(tox);
exit(1);
}
@@ -292,7 +292,7 @@
tox->interactive = 0;
toxine_run(tox, argc - optind, &argv[optind]);
- toxine_free(tox);
+ toxine_release(tox);
return 1;
}
Index: parse.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/parse.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- parse.c 31 Jul 2002 22:33:45 -0000 1.3
+++ parse.c 21 Sep 2002 00:07:29 -0000 1.4
@@ -48,7 +48,7 @@
if((tox->command.remain == NULL) && (tox->command.line && (strchr(tox->command.line, ';')))) {
tox->command.remain = strdup(tox->command.line);
- _FREE(tox->command.line);
+ toxine_free(tox->command.line);
}
if(tox->command.remain &&
@@ -110,12 +110,12 @@
sprintf(tox->command.remain, "%s", remaining);
}
else {
- _FREE(tox->command.remain);
+ toxine_free(tox->command.remain);
}
}
else {
- _FREE(tox->command.remain);
+ toxine_free(tox->command.remain);
}
}
@@ -129,7 +129,7 @@
sprintf(tox->command.line, "%s", tox->command.remain);
- _FREE(tox->command.remain);
+ toxine_free(tox->command.remain);
}
}
}
Index: playlist.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/playlist.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- playlist.c 19 Sep 2002 21:04:06 -0000 1.8
+++ playlist.c 21 Sep 2002 00:07:29 -0000 1.9
@@ -65,9 +65,9 @@
static int _playlist_free_mmk(mediamark_t **mmk) {
if((*mmk) != NULL) {
- _FREE((*mmk)->ident);
- _FREE((*mmk)->mrl);
- _FREE((*mmk));
+ toxine_free((*mmk)->ident);
+ toxine_free((*mmk)->mrl);
+ toxine_free((*mmk));
return 1;
}
return 0;
@@ -626,8 +626,8 @@
void playlist_replace_entry(mediamark_t **mmk,
const char *mrl, const char *ident, int start, int end) {
- _FREE((*mmk)->mrl);
- _FREE((*mmk)->ident);
+ toxine_free((*mmk)->mrl);
+ toxine_free((*mmk)->ident);
(*mmk)->start = 0;
(*mmk)->end = -1;
@@ -668,7 +668,7 @@
pinfo("Playlist file (%s) is valid (%s).\n", filename, playlist->type);
else {
perr("Playlist file (%s) isn't valid.\n", filename);
- _FREE(playlist);
+ toxine_free(playlist);
return;
}
@@ -682,10 +682,10 @@
for(i = 0; i < onum; i++)
(void) _playlist_free_mmk(&ommk[i]);
- _FREE(ommk);
+ toxine_free(ommk);
- _FREE(playlist->type);
- _FREE(playlist);
+ toxine_free(playlist->type);
+ toxine_free(playlist);
}
void playlist_save(toxine_t *tox, const char *filename) {
Index: sortcmds.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/sortcmds.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sortcmds.c 1 Aug 2002 22:52:09 -0000 1.1
+++ sortcmds.c 21 Sep 2002 00:07:29 -0000 1.2
@@ -360,9 +360,9 @@
fclose(symfile.fd);
for(i = 0; i < symfile.lines; i++)
- _FREE(symfile.symlines[i]);
+ toxine_free(symfile.symlines[i]);
- _FREE(symfile.symlines);
+ toxine_free(symfile.symlines);
}
static void print_version(void) {
@@ -472,11 +472,11 @@
}
for(i = 0; i <= clen; i++) {
- _FREE(cc[i].command);
- _FREE(cc[i].help);
- _FREE(cc[i].syntax);
+ toxine_free(cc[i].command);
+ toxine_free(cc[i].help);
+ toxine_free(cc[i].syntax);
}
- _FREE(cc);
+ toxine_free(cc);
if(use_output) {
fclose(output);
Index: utils.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/utils.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- utils.c 19 Sep 2002 18:59:46 -0000 1.14
+++ utils.c 21 Sep 2002 00:07:29 -0000 1.15
@@ -107,11 +107,11 @@
line = toxine_atoa(line);
if(!strncasecmp(line, "yes", strlen(line))) {
- _FREE(line);
+ toxine_free(line);
return 1;
}
- _FREE(line);
+ toxine_free(line);
}
return 0;
}
|
|
From: Daniel Caujolle-B. <f1...@us...> - 2002-09-20 23:54:24
|
Update of /cvsroot/toxine/toxine/src
In directory usw-pr-cvs1:/tmp/cvs-serv20464
Modified Files:
xine_commands.c
Log Message:
Don't overuse toxine_get_arg().
Index: xine_commands.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/xine_commands.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- xine_commands.c 20 Sep 2002 23:48:06 -0000 1.26
+++ xine_commands.c 20 Sep 2002 23:54:21 -0000 1.27
@@ -1330,7 +1330,7 @@
msg = toxine_get_arg(tox, 2);
if(buftype == -1) {
- buftype = atoi(((char *)toxine_get_arg(tox, 1)));
+ buftype = atoi(((char *)bufname));
if(buftype >= xine_get_log_section_count(tox->xine)) {
perr("buffer number %d is out of bounds\n", buftype);
return;
|
|
From: Daniel Caujolle-B. <f1...@us...> - 2002-09-20 23:48:09
|
Update of /cvsroot/toxine/toxine/src
In directory usw-pr-cvs1:/tmp/cvs-serv19191/src
Modified Files:
commands.c xine_commands.c xine_commands.h
Log Message:
Log related functions polished.
Index: commands.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/commands.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- commands.c 20 Sep 2002 22:36:47 -0000 1.41
+++ commands.c 20 Sep 2002 23:48:06 -0000 1.42
@@ -704,9 +704,7 @@
return 0;
}
- printf("init\n");
tox->video.cur_plugin->video_out_init(tox);
- printf("init done\n");
/* Display plugin help string, if available */
if(tox->video.cur_plugin->get_help) {
Index: xine_commands.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/xine_commands.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- xine_commands.c 20 Sep 2002 22:48:46 -0000 1.25
+++ xine_commands.c 20 Sep 2002 23:48:06 -0000 1.26
@@ -1213,15 +1213,54 @@
/*
*
*/
-void _xine_get_log_section_count(commands_t *command, toxine_t *tox, void *data) {
- int count;
+void _xine_get_log(commands_t *command, toxine_t *tox, void *data) {
+ int buftype = -1;
+ const char *const *logs;
+ const char *log = NULL, *bufname;
+ const char *const *log_names;
return_if_no_init(tox);
- pinfo("xine_get_log_section_count():\n");
- count = xine_get_log_section_count(tox->xine);
- pinfo("returned %d\n", count);
- pinfo("\n");
+
+ bufname = toxine_get_arg(tox, 1);
+
+ log_names = xine_get_log_names(tox->xine);
+ if(log_names) {
+ int i;
+
+ for(i = 0, log = *log_names++; log; log = *log_names++, i++) {
+ if(!strncasecmp(bufname, log, strlen(bufname))) {
+ buftype = i;
+ break;
+ }
+ }
+ }
+ if(buftype == -1) {
+ buftype = atoi(((char *)bufname));
+ if(buftype >= xine_get_log_section_count(tox->xine)) {
+ perr("buffer number %d is out of bounds\n", buftype);
+ return;
+ }
+ pinfo("xine_get_log(%d):\n", buftype);
+ }
+ else
+ pinfo("xine_get_log(%s):\n", log);
+
+ logs = xine_get_log(tox->xine, buftype);
+ if(logs) {
+ char buffer[2048];
+
+ for(log = *logs++; log; log = *logs++) {
+ memset(&buffer, 0, sizeof(buffer));
+ sprintf(buffer, "%s%c", log, '\n');
+ pinfo("%s", buffer);
+ }
+ pinfo(".\n");
+ }
+ else
+ pinfo("No log entry available.\n");
+
+ pinfo("\n");
}
/*
@@ -1230,55 +1269,78 @@
void _xine_get_log_names(commands_t *command, toxine_t *tox, void *data) {
const char *const *log_names;
const char *log;
+ char buffer[2048];
return_if_no_init(tox);
+
+ memset(&buffer, 0, sizeof(buffer));
+
pinfo("xine_get_log_names():\n");
log_names = xine_get_log_names(tox->xine);
if(log_names) {
for(log = *log_names++; log; log = *log_names++) {
- pinfo("%s, ", log);
+ if(strlen(buffer))
+ sprintf(buffer, "%s, %s", buffer, log);
+ else
+ sprintf(buffer, "%s", log);
}
-#warning CLEANME
- pinfo("\b\b.\n");
+ sprintf(buffer, "%s.\n", buffer);
+ pinfo(buffer);
+ pinfo(".\n");
}
}
/*
*
*/
-void _xine_log(commands_t *command, toxine_t *tox, void *data) {
- int buftype;
- const char *msg;
-
- return_if_no_init(tox);
+void _xine_get_log_section_count(commands_t *command, toxine_t *tox, void *data) {
+ int count;
- buftype = atoi(((char *)toxine_get_arg(tox, 1)));
- msg = toxine_get_arg(tox, 2);
- pinfo("xine_log(%d, '%s'\n", buftype, msg);
- xine_log(tox->xine, buftype, msg);
+ return_if_no_init(tox);
+ pinfo("xine_get_log_section_count():\n");
+ count = xine_get_log_section_count(tox->xine);
+ pinfo("returned %d\n", count);
pinfo("\n");
+
}
/*
*
*/
-void _xine_get_log(commands_t *command, toxine_t *tox, void *data) {
- int buftype;
- const char *const *logs;
- const char *log;
+void _xine_log(commands_t *command, toxine_t *tox, void *data) {
+ int buftype = -1;
+ const char *msg, *log = NULL, *bufname;
+ const char *const *log_names;
return_if_no_init(tox);
- buftype = atoi(((char *)toxine_get_arg(tox, 1)));
- pinfo("xine_get_log(%d):\n", buftype);
- logs = xine_get_log(tox->xine, buftype);
- if(logs) {
- for(log = *logs++; log; log = *logs++) {
- pinfo("%s, ", log);
+ bufname = toxine_get_arg(tox, 1);
+ log_names = xine_get_log_names(tox->xine);
+ if(log_names) {
+ int i;
+
+ for(i = 0, log = *log_names++; log; log = *log_names++, i++) {
+ if(!strncasecmp(bufname, log, strlen(bufname))) {
+ buftype = i;
+ break;
+ }
}
}
+
+ msg = toxine_get_arg(tox, 2);
+
+ if(buftype == -1) {
+ buftype = atoi(((char *)toxine_get_arg(tox, 1)));
+ if(buftype >= xine_get_log_section_count(tox->xine)) {
+ perr("buffer number %d is out of bounds\n", buftype);
+ return;
+ }
+ pinfo("xine_log(%d, '%s')\n", buftype, msg);
+ }
else
- pinfo("No log entry available.\n");
+ pinfo("xine_log(%s, '%s')\n", log, msg);
+
+ xine_log(tox->xine, buftype, msg);
pinfo("\n");
}
Index: xine_commands.h
===================================================================
RCS file: /cvsroot/toxine/toxine/src/xine_commands.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xine_commands.h 20 Sep 2002 22:48:46 -0000 1.15
+++ xine_commands.h 20 Sep 2002 23:48:06 -0000 1.16
@@ -37,9 +37,9 @@
void _xine_get_audio_lang(commands_t *, toxine_t *, void *);
void _xine_get_spu_lang(commands_t *, toxine_t *, void *);
void _xine_get_pos_length(commands_t *, toxine_t *, void *);
-void _xine_get_log_section_count(commands_t *, toxine_t *, void *);
-void _xine_get_log_names(commands_t *, toxine_t *, void *);
void _xine_log(commands_t *, toxine_t *, void *);
+void _xine_get_log_names(commands_t *, toxine_t *, void *);
+void _xine_get_log_section_count(commands_t *, toxine_t *, void *);
void _xine_get_log(commands_t *, toxine_t *, void *);
void _xine_get_browsable_input_plugin_ids(commands_t *, toxine_t *, void *);
void _xine_get_browse_mrls(commands_t *, toxine_t *, void *);
@@ -202,21 +202,23 @@
"set position length.", \
"xine_get_pos_length" \
}, \
- { "xine_get_log_section_count", NO_ARGS, _xine_get_log_section_count, \
- "xine_get_log_section_count", \
- "xine_get_log_section_count" \
+ { "xine_get_log", REQUIRE_ARGS, _xine_get_log, \
+ "Retrieve log entries from given buffer.", \
+ "xine_get_log <buffer>\n" \
+ " - buffer can be named (matching with xine_get_log_names()) or a numeric value." \
}, \
{ "xine_get_log_names", NO_ARGS, _xine_get_log_names, \
- "xine_get_log_names", \
+ "Retrieve log section names.", \
"xine_get_log_names" \
}, \
- { "xine_log", REQUIRE_ARGS, _xine_log, \
- "xine_log", \
- "xine_log" \
+ { "xine_get_log_section_count", NO_ARGS, _xine_get_log_section_count, \
+ "Retrieve number of log buffers.", \
+ "xine_get_log_section_count" \
}, \
- { "xine_get_log", REQUIRE_ARGS, _xine_get_log, \
- "xine_get_log", \
- "xine_get_log" \
+ { "xine_log", REQUIRE_ARGS, _xine_log, \
+ "Add an entry to a log buffer.", \
+ "xine_log <buffer> <message>\n" \
+ " - buffer can be named (matching with xine_get_log_names()) or a numeric value." \
}, \
{ "xine_get_browsable_input_plugin_ids", NO_ARGS, _xine_get_browsable_input_plugin_ids, \
"Get list of browsable input plugins.", \
|
|
From: Daniel Caujolle-B. <f1...@us...> - 2002-09-20 23:48:08
|
Update of /cvsroot/toxine/toxine/doc/man/en In directory usw-pr-cvs1:/tmp/cvs-serv19191/doc/man/en Modified Files: toxine.1 Log Message: Log related functions polished. Index: toxine.1 =================================================================== RCS file: /cvsroot/toxine/toxine/doc/man/en/toxine.1,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- toxine.1 20 Sep 2002 22:48:46 -0000 1.20 +++ toxine.1 20 Sep 2002 23:48:06 -0000 1.21 @@ -991,16 +991,18 @@ .br .br .TP -.BR xine_get_log_section_count +.BR xine_get_log .br .BR action: .br -xine_get_log_section_count +Retrieve log entries from given buffer. .br .BR syntax: .br -\ \ xine_get_log_section_count +\ \ xine_get_log <buffer> +.br +\ \ \- buffer can be named (matching with xine_get_log_names()) or a numeric value. .br .br .TP @@ -1008,7 +1010,7 @@ .br .BR action: .br -xine_get_log_names +Retrieve log section names. .br .BR syntax: @@ -1017,29 +1019,31 @@ .br .br .TP -.BR xine_log +.BR xine_get_log_section_count .br .BR action: .br -xine_log +Retrieve number of log buffers. .br .BR syntax: .br -\ \ xine_log +\ \ xine_get_log_section_count .br .br .TP -.BR xine_get_log +.BR xine_log .br .BR action: .br -xine_get_log +Add an entry to a log buffer. .br .BR syntax: .br -\ \ xine_get_log +\ \ xine_log <buffer> <message> +.br +\ \ \- buffer can be named (matching with xine_get_log_names()) or a numeric value. .br .br .TP |
|
From: Daniel Caujolle-B. <f1...@us...> - 2002-09-20 22:48:48
|
Update of /cvsroot/toxine/toxine/src
In directory usw-pr-cvs1:/tmp/cvs-serv4894/src
Modified Files:
xine_commands.c xine_commands.h
Log Message:
Fix aspect ratio missusing.
Index: xine_commands.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/xine_commands.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- xine_commands.c 20 Sep 2002 22:36:47 -0000 1.24
+++ xine_commands.c 20 Sep 2002 22:48:46 -0000 1.25
@@ -325,7 +325,8 @@
{ "XINE_VO_ASPECT_4_3" , XINE_VO_ASPECT_4_3},
{ "XINE_VO_ASPECT_ANAMORPHIC", XINE_VO_ASPECT_ANAMORPHIC},
{ "XINE_VO_ASPECT_DVB" , XINE_VO_ASPECT_DVB},
- { "XINE_VO_ASPECT_NUM_RATIOS", XINE_VO_ASPECT_NUM_RATIOS},
+ /* Don't use ;-) */
+ /* { "XINE_VO_ASPECT_NUM_RATIOS", XINE_VO_ASPECT_NUM_RATIOS}, */
{ "XINE_VO_ASPECT_PAN_SCAN" , XINE_VO_ASPECT_PAN_SCAN},
{ "XINE_VO_ASPECT_DONT_TOUCH", XINE_VO_ASPECT_DONT_TOUCH},
{ NULL , 0 }
Index: xine_commands.h
===================================================================
RCS file: /cvsroot/toxine/toxine/src/xine_commands.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xine_commands.h 20 Sep 2002 22:36:47 -0000 1.14
+++ xine_commands.h 20 Sep 2002 22:48:46 -0000 1.15
@@ -186,8 +186,8 @@
" XINE_SPEED_FAST_2 | XINE_SPEED_FAST_4 | XINE_SPEED_FAST_4]\n" \
" for XINE_PARAM_VO_ASPECT_RATIO:\n" \
" [XINE_VO_ASPECT_AUTO | XINE_VO_ASPECT_SQUARE | XINE_VO_ASPECT_4_3 |\n" \
- " XINE_VO_ASPECT_ANAMORPHIC | XINE_VO_ASPECT_DVB | XINE_VO_ASPECT_NUM_RATIOS |\n" \
- " XINE_VO_ASPECT_PAN_SCAN | XINE_VO_ASPECT_DONT_TOUCH]\n" \
+ " XINE_VO_ASPECT_ANAMORPHIC | XINE_VO_ASPECT_DVB | XINE_VO_ASPECT_PAN_SCAN |\n" \
+ " XINE_VO_ASPECT_DONT_TOUCH]\n" \
" or any numeric value for any parameter." \
}, \
{ "xine_get_audio_lang", OPTIONAL_ARGS, _xine_get_audio_lang, \
|
|
From: Daniel Caujolle-B. <f1...@us...> - 2002-09-20 22:48:48
|
Update of /cvsroot/toxine/toxine/doc/man/en In directory usw-pr-cvs1:/tmp/cvs-serv4894/doc/man/en Modified Files: toxine.1 Log Message: Fix aspect ratio missusing. Index: toxine.1 =================================================================== RCS file: /cvsroot/toxine/toxine/doc/man/en/toxine.1,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- toxine.1 20 Sep 2002 22:36:47 -0000 1.19 +++ toxine.1 20 Sep 2002 22:48:46 -0000 1.20 @@ -946,7 +946,7 @@ .br \ \ for XINE_PARAM_VO_ASPECT_RATIO: .br -\ \ [XINE_VO_ASPECT_AUTO | XINE_VO_ASPECT_SQUARE | XINE_VO_ASPECT_4_3 | XINE_VO_ASPECT_ANAMORPHIC | XINE_VO_ASPECT_DVB | XINE_VO_ASPECT_NUM_RATIOS | XINE_VO_ASPECT_PAN_SCAN | XINE_VO_ASPECT_DONT_TOUCH] +\ \ [XINE_VO_ASPECT_AUTO | XINE_VO_ASPECT_SQUARE | XINE_VO_ASPECT_4_3 | XINE_VO_ASPECT_ANAMORPHIC | XINE_VO_ASPECT_DVB | XINE_VO_ASPECT_PAN_SCAN | XINE_VO_ASPECT_DONT_TOUCH] .br \ \ or any numeric value for any parameter. .br |
|
From: Daniel Caujolle-B. <f1...@us...> - 2002-09-20 22:36:50
|
Update of /cvsroot/toxine/toxine/src/plugins/video_out
In directory usw-pr-cvs1:/tmp/cvs-serv1150/src/plugins/video_out
Modified Files:
video_out_none.c
Log Message:
Made it compile against latest xine CVS. Fix missinstallation of none vo plugin
in debug stage. Don't use anymore embeded xine.m4.
Index: video_out_none.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/plugins/video_out/video_out_none.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- video_out_none.c 17 Sep 2002 21:54:46 -0000 1.4
+++ video_out_none.c 20 Sep 2002 22:36:48 -0000 1.5
@@ -147,7 +147,7 @@
}
static void none_display_frame(xine_vo_driver_t *vo_driver, vo_frame_t *vo_frame) {
- none_driver_t *driver = (none_driver_t *)vo_driver;
+ /* none_driver_t *driver = (none_driver_t *)vo_driver; */
none_frame_t *frame = (none_frame_t *)vo_frame;
frame->vo_frame.displayed(&frame->vo_frame);
|
|
From: Daniel Caujolle-B. <f1...@us...> - 2002-09-20 22:36:50
|
Update of /cvsroot/toxine/toxine/src
In directory usw-pr-cvs1:/tmp/cvs-serv1150/src
Modified Files:
commands.c xine_commands.c xine_commands.h
Log Message:
Made it compile against latest xine CVS. Fix missinstallation of none vo plugin
in debug stage. Don't use anymore embeded xine.m4.
Index: commands.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/commands.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- commands.c 20 Sep 2002 14:16:42 -0000 1.40
+++ commands.c 20 Sep 2002 22:36:47 -0000 1.41
@@ -690,17 +690,15 @@
int j;
for(j = 0; vonames[j] != NULL; j++) {
- printf("check %s (want '%s')\n", vonames[j], tox->video.name);
if(!strcasecmp(vonames[j], tox->video.name)) {
- printf("FOUND\n");
tox->video.cur_plugin = tox->video.plugins[i];
goto __vo_found;
}
}
}
-
+
__vo_found:
-
+
if(!tox->video.cur_plugin) {
perr("No video driver name match with '%s'\n", tox->video.name);
return 0;
@@ -2491,13 +2489,9 @@
return_if_no_new(tox);
pinfo("Dumping all config object:\n");
-#warning UNNEEDED WITH FRESH CVS
- memset(&cfg_entry, 0, sizeof(xine_cfg_entry_t));
if((xine_config_get_first_entry(tox->xine, &cfg_entry))) {
do {
toxine_dump_config_entry(tox, &cfg_entry);
-#warning UNNEEDED WITH FRESH CVS
- memset(&cfg_entry, 0, sizeof(xine_cfg_entry_t));
} while((xine_config_get_next_entry(tox->xine, &cfg_entry)));
}
pinfo(".\n");
Index: xine_commands.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/xine_commands.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xine_commands.c 20 Sep 2002 14:16:43 -0000 1.23
+++ xine_commands.c 20 Sep 2002 22:36:47 -0000 1.24
@@ -200,16 +200,19 @@
char *name;
int type;
} stream_infos[] = {
- { "XINE_STREAM_INFO_WIDTH" , XINE_STREAM_INFO_WIDTH },
- { "XINE_STREAM_INFO_HEIGHT" , XINE_STREAM_INFO_HEIGHT },
+ { "XINE_STREAM_INFO_BITRATE" , XINE_STREAM_INFO_BITRATE },
{ "XINE_STREAM_INFO_SEEKABLE" , XINE_STREAM_INFO_SEEKABLE },
- { "XINE_STREAM_INFO_VIDEO_FOURCC" , XINE_STREAM_INFO_VIDEO_FOURCC },
+ { "XINE_STREAM_INFO_VIDEO_WIDTH" , XINE_STREAM_INFO_VIDEO_WIDTH },
+ { "XINE_STREAM_INFO_VIDEO_HEIGHT" , XINE_STREAM_INFO_VIDEO_HEIGHT },
+ { "XINE_STREAM_INFO_VIDEO_RATIO" , XINE_STREAM_INFO_VIDEO_RATIO },
{ "XINE_STREAM_INFO_VIDEO_CHANNELS" , XINE_STREAM_INFO_VIDEO_CHANNELS },
{ "XINE_STREAM_INFO_VIDEO_STREAMS" , XINE_STREAM_INFO_VIDEO_STREAMS },
- { "XINE_STREAM_INFO_AUDIO_FOURCC" , XINE_STREAM_INFO_AUDIO_FOURCC },
+ { "XINE_STREAM_INFO_VIDEO_BITRATE" , XINE_STREAM_INFO_VIDEO_BITRATE },
+ { "XINE_STREAM_INFO_FRAME_DURATION" , XINE_STREAM_INFO_FRAME_DURATION },
{ "XINE_STREAM_INFO_AUDIO_CHANNELS" , XINE_STREAM_INFO_AUDIO_CHANNELS },
{ "XINE_STREAM_INFO_AUDIO_BITS" , XINE_STREAM_INFO_AUDIO_BITS },
{ "XINE_STREAM_INFO_AUDIO_SAMPLERATE", XINE_STREAM_INFO_AUDIO_SAMPLERATE },
+ { "XINE_STREAM_INFO_AUDIO_BITRATE" , XINE_STREAM_INFO_AUDIO_BITRATE },
{ "XINE_STREAM_INFO_HAS_CHAPTERS" , XINE_STREAM_INFO_HAS_CHAPTERS },
{ NULL , 0 }
};
@@ -763,23 +766,21 @@
pinfo("xine_get_stream_info(%s):\n", stream_infos[i].name);
stream_info = xine_get_stream_info(tox->xine, stream_infos[i].type);
switch(stream_infos[i].type) {
- case XINE_STREAM_INFO_WIDTH:
- case XINE_STREAM_INFO_HEIGHT:
+
+ case XINE_STREAM_INFO_BITRATE:
case XINE_STREAM_INFO_SEEKABLE:
- case XINE_STREAM_INFO_VIDEO_CHANNELS:
- case XINE_STREAM_INFO_VIDEO_STREAMS:
+ case XINE_STREAM_INFO_VIDEO_WIDTH:
+ case XINE_STREAM_INFO_VIDEO_HEIGHT:
+ case XINE_STREAM_INFO_VIDEO_RATIO:
+ case XINE_STREAM_INFO_VIDEO_BITRATE:
+ case XINE_STREAM_INFO_FRAME_DURATION:
case XINE_STREAM_INFO_AUDIO_CHANNELS:
+ case XINE_STREAM_INFO_AUDIO_BITS:
case XINE_STREAM_INFO_AUDIO_SAMPLERATE:
+ case XINE_STREAM_INFO_AUDIO_BITRATE:
case XINE_STREAM_INFO_HAS_CHAPTERS:
pinfo("%d\n", stream_info);
break;
-#warning FILLME
- case XINE_STREAM_INFO_VIDEO_FOURCC:
- break;
- case XINE_STREAM_INFO_AUDIO_FOURCC:
- break;
- case XINE_STREAM_INFO_AUDIO_BITS:
- break;
}
pinfo("\n");
}
@@ -1616,9 +1617,6 @@
return_if_no_new(tox);
-#warning UNNEEDED WITH FRESH CVS
- memset(&cfg_entry, 0, sizeof(xine_cfg_entry_t));
-
pinfo("xine_config_get_first_entry():\n");
if((xine_config_get_first_entry(tox->xine, &cfg_entry)))
toxine_dump_config_entry(tox, &cfg_entry);
@@ -1632,9 +1630,6 @@
return_if_no_new(tox);
-#warning UNNEEDED WITH FRESH CVS
- memset(&cfg_entry, 0, sizeof(xine_cfg_entry_t));
-
pinfo("xine_config_get_next_entry():\n");
if((xine_config_get_next_entry(tox->xine, &cfg_entry)))
toxine_dump_config_entry(tox, &cfg_entry);
@@ -1649,9 +1644,6 @@
return_if_no_new(tox);
-#warning UNNEEDED WITH FRESH CVS
- memset(&cfg_entry, 0, sizeof(xine_cfg_entry_t));
-
key = toxine_get_arg(tox, 1);
pinfo("xine_config_lookup_entry(%s)\n", key);
if((xine_config_lookup_entry(tox->xine, key, &cfg_entry)))
@@ -1672,9 +1664,6 @@
const char *svalue;
int valid_entry = 0;
-#warning UNNEEDED WITH FRESH CVS
- memset(&cfg_entry, 0, sizeof(xine_cfg_entry_t));
-
key = toxine_get_arg(tox, 1);
svalue = toxine_get_arg(tox, 2);
value = atoi(((char *) svalue));
Index: xine_commands.h
===================================================================
RCS file: /cvsroot/toxine/toxine/src/xine_commands.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xine_commands.h 20 Sep 2002 14:16:43 -0000 1.13
+++ xine_commands.h 20 Sep 2002 22:36:47 -0000 1.14
@@ -122,8 +122,16 @@
" XINE_TRICK_MODE_FAST_REWIND]" \
}, \
{ "xine_get_stream_info", REQUIRE_ARGS, _xine_get_stream_info, \
- "get stream info.", \
- "xine_get_stream_info" \
+ "Get stream info.", \
+ "xine_get_stream_info <info type>\n" \
+ " - info type can be:\n" \
+ " [XINE_STREAM_INFO_BITRATE | XINE_STREAM_INFO_SEEKABLE |\n" \
+ " XINE_STREAM_INFO_VIDEO_WIDTH | XINE_STREAM_INFO_VIDEO_HEIGHT |\n" \
+ " XINE_STREAM_INFO_VIDEO_RATIO | XINE_STREAM_INFO_VIDEO_CHANNELS |\n" \
+ " XINE_STREAM_INFO_VIDEO_STREAMS | XINE_STREAM_INFO_VIDEO_BITRATE |\n" \
+ " XINE_STREAM_INFO_FRAME_DURATION | XINE_STREAM_INFO_AUDIO_CHANNELS |\n" \
+ " XINE_STREAM_INFO_AUDIO_BITS | XINE_STREAM_INFO_AUDIO_SAMPLERATE |\n" \
+ " XINE_STREAM_INFO_AUDIO_BITRATE | XINE_STREAM_INFO_HAS_CHAPTERS]" \
}, \
{ "xine_stop", NO_ARGS, _xine_stop, \
"Stop playback", \
|
|
From: Daniel Caujolle-B. <f1...@us...> - 2002-09-20 22:36:50
|
Update of /cvsroot/toxine/toxine/src/plugins In directory usw-pr-cvs1:/tmp/cvs-serv1150/src/plugins Modified Files: Makefile.am Log Message: Made it compile against latest xine CVS. Fix missinstallation of none vo plugin in debug stage. Don't use anymore embeded xine.m4. Index: Makefile.am =================================================================== RCS file: /cvsroot/toxine/toxine/src/plugins/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Makefile.am 17 Sep 2002 22:23:04 -0000 1.4 +++ Makefile.am 20 Sep 2002 22:36:48 -0000 1.5 @@ -34,6 +34,9 @@ @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" install-debug: debug + @list='$(SUBDIRS)'; for subdir in $$list; do \ + (cd $$subdir && $(MAKE) $@) || exit;\ + done; @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am mostlyclean-generic: |
|
From: Daniel Caujolle-B. <f1...@us...> - 2002-09-20 22:36:50
|
Update of /cvsroot/toxine/toxine/m4 In directory usw-pr-cvs1:/tmp/cvs-serv1150/m4 Modified Files: Makefile.am Removed Files: xine.m4 Log Message: Made it compile against latest xine CVS. Fix missinstallation of none vo plugin in debug stage. Don't use anymore embeded xine.m4. Index: Makefile.am =================================================================== RCS file: /cvsroot/toxine/toxine/m4/Makefile.am,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile.am 13 May 2002 20:45:35 -0000 1.1.1.1 +++ Makefile.am 20 Sep 2002 22:36:47 -0000 1.2 @@ -1,7 +1,7 @@ ## ## Process this file with automake to produce Makefile.in ## -EXTRA_DIST = _toxine.m4 xine.m4 readline.m4 aa.m4 +EXTRA_DIST = _toxine.m4 readline.m4 aa.m4 debug: install-debug: debug --- xine.m4 DELETED --- |
|
From: Daniel Caujolle-B. <f1...@us...> - 2002-09-20 22:36:50
|
Update of /cvsroot/toxine/toxine/doc/man/en In directory usw-pr-cvs1:/tmp/cvs-serv1150/doc/man/en Modified Files: toxine.1 Log Message: Made it compile against latest xine CVS. Fix missinstallation of none vo plugin in debug stage. Don't use anymore embeded xine.m4. Index: toxine.1 =================================================================== RCS file: /cvsroot/toxine/toxine/doc/man/en/toxine.1,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- toxine.1 20 Sep 2002 14:16:40 -0000 1.18 +++ toxine.1 20 Sep 2002 22:36:47 -0000 1.19 @@ -1,7 +1,7 @@ .\" -*-Nroff-*- .\"" .\"" -.TH TOXINE 1x 2002-09-20 "toxine" +.TH TOXINE 1x 2002-09-21 "toxine" .SH NAME toxine \- a text program, using xine library. .SH SYNOPSIS @@ -832,12 +832,16 @@ .br .BR action: .br -get stream info. +Get stream info. .br .BR syntax: .br -\ \ xine_get_stream_info +\ \ xine_get_stream_info <info type> +.br +\ \ \- info type can be: +.br +\ \ [XINE_STREAM_INFO_BITRATE | XINE_STREAM_INFO_SEEKABLE | XINE_STREAM_INFO_VIDEO_WIDTH | XINE_STREAM_INFO_VIDEO_HEIGHT | XINE_STREAM_INFO_VIDEO_RATIO | XINE_STREAM_INFO_VIDEO_CHANNELS | XINE_STREAM_INFO_VIDEO_STREAMS | XINE_STREAM_INFO_VIDEO_BITRATE | XINE_STREAM_INFO_FRAME_DURATION | XINE_STREAM_INFO_AUDIO_CHANNELS | XINE_STREAM_INFO_AUDIO_BITS | XINE_STREAM_INFO_AUDIO_SAMPLERATE | XINE_STREAM_INFO_AUDIO_BITRATE | XINE_STREAM_INFO_HAS_CHAPTERS] .br .br .TP |
|
From: Daniel Caujolle-B. <f1...@us...> - 2002-09-20 22:36:50
|
Update of /cvsroot/toxine/toxine
In directory usw-pr-cvs1:/tmp/cvs-serv1150
Modified Files:
cvscompile.sh
Log Message:
Made it compile against latest xine CVS. Fix missinstallation of none vo plugin
in debug stage. Don't use anymore embeded xine.m4.
Index: cvscompile.sh
===================================================================
RCS file: /cvsroot/toxine/toxine/cvscompile.sh,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- cvscompile.sh 13 May 2002 20:45:35 -0000 1.1.1.1
+++ cvscompile.sh 20 Sep 2002 22:36:47 -0000 1.2
@@ -6,7 +6,7 @@
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
-m4_files="_toxine.m4 xine.m4 readline.m4 aa.m4"
+m4_files="_toxine.m4 readline.m4 aa.m4"
if test -d m4; then
rm -f acinclude.m4
for m4f in $m4_files; do
|
|
From: Daniel Caujolle-B. <f1...@us...> - 2002-09-20 14:16:47
|
Update of /cvsroot/toxine/toxine/src
In directory usw-pr-cvs1:/tmp/cvs-serv20487/src
Modified Files:
commands.c xine_commands.c xine_commands.h
Log Message:
Implement xine_config* function (and dumpconfig).
Index: commands.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/commands.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- commands.c 19 Sep 2002 21:04:06 -0000 1.39
+++ commands.c 20 Sep 2002 14:16:42 -0000 1.40
@@ -155,6 +155,8 @@
static void do_display(commands_t *, toxine_t *, void *);
static void do_mediamk(commands_t *, toxine_t *, void *);
static void do_echo(commands_t *, toxine_t *, void *);
+static void do_dumpconfig(commands_t *, toxine_t *, void *);
+
static commands_t commands[] = {
{ "!", NO_ARGS, do_shell,
@@ -181,15 +183,6 @@
"Display all available commands.",
"commands"
},
- /*
- { "config", REQUIRE_ARGS, _NAPI_config,
- "Manage xine's config stuff.",
- "config read <filename>\n"
- "config save\n"
- "config lookup <key>\n"
- "config dump"
- },
- */
{ "display", REQUIRE_ARGS, do_display,
"Display some status",
"display current <[position | time]>\n"
@@ -199,6 +192,10 @@
"send XINE_EVENT_INPUT_DOWN event to xine engine",
"down"
},
+ { "dumpconfig", NO_ARGS, do_dumpconfig,
+ "Dump all entries of current config object.",
+ "dumpconfig"
+ },
{ "echo", REQUIRE_ARGS, do_echo,
"echoing some text / variables",
"echo <[string|variable]> ...\n"
@@ -2486,4 +2483,24 @@
}
}
+}
+
+static void do_dumpconfig(commands_t *command, toxine_t *tox, void *data) {
+ xine_cfg_entry_t cfg_entry;
+
+ return_if_no_new(tox);
+
+ pinfo("Dumping all config object:\n");
+#warning UNNEEDED WITH FRESH CVS
+ memset(&cfg_entry, 0, sizeof(xine_cfg_entry_t));
+ if((xine_config_get_first_entry(tox->xine, &cfg_entry))) {
+ do {
+ toxine_dump_config_entry(tox, &cfg_entry);
+#warning UNNEEDED WITH FRESH CVS
+ memset(&cfg_entry, 0, sizeof(xine_cfg_entry_t));
+ } while((xine_config_get_next_entry(tox->xine, &cfg_entry)));
+ }
+ pinfo(".\n");
+
+ pinfo("\n");
}
Index: xine_commands.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/xine_commands.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xine_commands.c 19 Sep 2002 21:04:06 -0000 1.22
+++ xine_commands.c 20 Sep 2002 14:16:43 -0000 1.23
@@ -362,7 +362,7 @@
}
-static void _dump_config_entry(toxine_t *tox, xine_cfg_entry_t *entry) {
+void toxine_dump_config_entry(toxine_t *tox, xine_cfg_entry_t *entry) {
pinfo("%s:\n", entry->key);
pinfo(" entry->description: '%s'\n", (entry->description) ? entry->description : "none");
@@ -1609,6 +1609,165 @@
}
/*
+ * ****** CONFIG ******
+ */
+void _xine_config_get_first_entry(commands_t *command, toxine_t *tox, void *data) {
+ xine_cfg_entry_t cfg_entry;
+
+ return_if_no_new(tox);
+
+#warning UNNEEDED WITH FRESH CVS
+ memset(&cfg_entry, 0, sizeof(xine_cfg_entry_t));
+
+ pinfo("xine_config_get_first_entry():\n");
+ if((xine_config_get_first_entry(tox->xine, &cfg_entry)))
+ toxine_dump_config_entry(tox, &cfg_entry);
+ else
+ perr("xine_config_get_first_entry() returned NULL\n");
+
+ pinfo("\n");
+}
+void _xine_config_get_next_entry(commands_t *command, toxine_t *tox, void *data) {
+ xine_cfg_entry_t cfg_entry;
+
+ return_if_no_new(tox);
+
+#warning UNNEEDED WITH FRESH CVS
+ memset(&cfg_entry, 0, sizeof(xine_cfg_entry_t));
+
+ pinfo("xine_config_get_next_entry():\n");
+ if((xine_config_get_next_entry(tox->xine, &cfg_entry)))
+ toxine_dump_config_entry(tox, &cfg_entry);
+ else
+ perr("xine_config_get_next_entry() returned NULL\n");
+
+ pinfo("\n");
+}
+void _xine_config_lookup_entry(commands_t *command, toxine_t *tox, void *data) {
+ const char *key;
+ xine_cfg_entry_t cfg_entry;
+
+ return_if_no_new(tox);
+
+#warning UNNEEDED WITH FRESH CVS
+ memset(&cfg_entry, 0, sizeof(xine_cfg_entry_t));
+
+ key = toxine_get_arg(tox, 1);
+ pinfo("xine_config_lookup_entry(%s)\n", key);
+ if((xine_config_lookup_entry(tox->xine, key, &cfg_entry)))
+ toxine_dump_config_entry(tox, &cfg_entry);
+ else
+ perr("Entry '%s' doesn't exist.\n", key);
+
+ pinfo("\n");
+}
+void _xine_config_update_entry(commands_t *command, toxine_t *tox, void *data) {
+ const char *key;
+ int value;
+ xine_cfg_entry_t cfg_entry;
+
+ return_if_no_new(tox);
+
+ if(toxine_is_args(tox) >= 2) {
+ const char *svalue;
+ int valid_entry = 0;
+
+#warning UNNEEDED WITH FRESH CVS
+ memset(&cfg_entry, 0, sizeof(xine_cfg_entry_t));
+
+ key = toxine_get_arg(tox, 1);
+ svalue = toxine_get_arg(tox, 2);
+ value = atoi(((char *) svalue));
+
+ pinfo("xine_config_lookup_entry(%s)\n", key);
+ if((xine_config_lookup_entry(tox->xine, key, &cfg_entry))) {
+
+ switch(cfg_entry.type) {
+
+ case XINE_CONFIG_TYPE_STRING:
+ cfg_entry.str_value = (char *)svalue;
+ valid_entry = 1;
+ break;
+
+ case XINE_CONFIG_TYPE_RANGE:
+ case XINE_CONFIG_TYPE_ENUM:
+ case XINE_CONFIG_TYPE_NUM:
+ cfg_entry.num_value = value;
+ valid_entry = 1;
+ break;
+
+ case XINE_CONFIG_TYPE_BOOL:
+ cfg_entry.num_value = (value) ? 1 : 0;
+ valid_entry = 1;
+ break;
+
+ case XINE_CONFIG_TYPE_UNKNOWN:
+ perr("Entry not registered\n");
+ break;
+ }
+
+ if(valid_entry) {
+ pinfo("xine_config_update_entry(%s):\n", key);
+ xine_config_update_entry(tox->xine, &cfg_entry);
+ pinfo(".\n");
+ }
+ }
+ else
+ perr("Entry '%s' doesn't exist.\n", key);
+
+ pinfo("\n");
+
+ }
+ else
+ perr("Argument(s) missing.\n");
+
+}
+void _xine_load_config(commands_t *command, toxine_t *tox, void *data) {
+ const char *filename = NULL;
+
+ return_if_no_new(tox);
+
+ if(toxine_is_args(tox)) {
+ filename = toxine_get_arg(tox, 1);
+ if(tox->configfile)
+ free((char *)tox->configfile);
+ tox->configfile = strdup(filename);
+ }
+
+ pinfo("xine_load_config(%s):\n", tox->configfile);
+ xine_load_config(tox->xine, tox->configfile);
+ pinfo(".\n");
+
+ pinfo("\n");
+}
+void _xine_save_config(commands_t *command, toxine_t *tox, void *data) {
+ const char *filename = NULL;
+
+ return_if_no_new(tox);
+
+ if(toxine_is_args(tox))
+ filename = toxine_get_arg(tox, 1);
+
+ pinfo("xine_save_config(%s):\n", (filename) ? filename : tox->configfile);
+ xine_save_config(tox->xine, ((filename) ? filename : tox->configfile));
+ pinfo(".\n");
+
+ pinfo("\n");
+}
+void _xine_reset_config(commands_t *command, toxine_t *tox, void *data) {
+ return_if_no_new(tox);
+
+ pinfo("xine_reset_config():\n");
+ xine_reset_config(tox->xine);
+ pinfo(".\n");
+
+ pinfo("\n");
+}
+/*
+ * ****** END CONFIG ******
+ */
+
+/*
*
*/
void _xine_get_version(commands_t *command, toxine_t *tox, void *data) {
@@ -2209,7 +2368,7 @@
pinfo("Dump all config entries:\n");
for(entry = tox->config->first; entry; entry = entry->next)
- _dump_config_entry(NULL, entry);
+ toxine_dump_config_entry(NULL, entry);
pinfo(".\n");
}
@@ -2236,9 +2395,9 @@
pinfo("config->lookup_entry(config, %s)\n", key);
entry = tox->config->lookup_entry(tox->config, key);
-
+
if(entry)
- _dump_config_entry(tox, entry);
+ toxine_dump_config_entry(tox, entry);
else
pinfo("config key '%s' not found\n", key);
Index: xine_commands.h
===================================================================
RCS file: /cvsroot/toxine/toxine/src/xine_commands.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xine_commands.h 19 Sep 2002 18:59:46 -0000 1.12
+++ xine_commands.h 20 Sep 2002 14:16:43 -0000 1.13
@@ -20,6 +20,7 @@
#ifndef __TOXINE_XINE_COMMANDS_H__
#define __TOXINE_XINE_COMMANDS_H__
+void toxine_dump_config_entry(toxine_t *, xine_cfg_entry_t *);
void _xine_new(commands_t *, toxine_t *, void *);
void _xine_init(commands_t *, toxine_t *, void *);
void _xine_open(commands_t *, toxine_t *, void *);
@@ -48,10 +49,16 @@
void _xine_list_audio_output_plugins(commands_t *, toxine_t *, void *);
void _xine_list_video_output_plugins(commands_t *, toxine_t *, void *);
void _xine_send_event(commands_t *, toxine_t *, void *);
+void _xine_config_get_first_entry(commands_t *, toxine_t *, void *);
+void _xine_config_get_next_entry(commands_t *, toxine_t *, void *);
+void _xine_config_lookup_entry(commands_t *, toxine_t *, void *);
+void _xine_config_update_entry(commands_t *, toxine_t *, void *);
+void _xine_load_config(commands_t *, toxine_t *, void *);
+void _xine_save_config(commands_t *, toxine_t *, void *);
+void _xine_reset_config(commands_t *, toxine_t *, void *);
void _xine_get_version(commands_t *, toxine_t *, void *);
void _xine_check_version(commands_t *, toxine_t *, void *);
-
/////////////////////
/*
void _xine_get_spu_channel(commands_t *, toxine_t *, void *);
@@ -259,6 +266,34 @@
" XINE_EVENT_INPUT_NUMBER_10_ADD | XINE_EVENT_ASPECT_CHANGE |\n" \
" XINE_EVENT_OUTPUT_VIDEO | XINE_EVENT_OUTPUT_NO_VIDEO]" \
}, \
+ { "xine_config_get_first_entry", NO_ARGS, _xine_config_get_first_entry, \
+ "Get first entry in xine config object.", \
+ "_xine_config_get_first_entry" \
+ }, \
+ { "xine_config_get_next_entry", NO_ARGS, _xine_config_get_next_entry, \
+ "Get next entry in xine config object.", \
+ "_xine_config_get_next_entry" \
+ }, \
+ { "xine_config_lookup_entry", REQUIRE_ARGS, _xine_config_lookup_entry, \
+ "Retrieve config entry matching with a keystring.", \
+ "_xine_config_lookup_entry <key>" \
+ }, \
+ { "xine_config_update_entry", REQUIRE_ARGS, _xine_config_update_entry, \
+ "Update value of specified entry.", \
+ "_xine_config_update_entry <key> <value>" \
+ }, \
+ { "xine_load_config", OPTIONAL_ARGS, _xine_load_config, \
+ "Load a config file (filename is optional).", \
+ "xine_load_config [filename]" \
+ }, \
+ { "xine_save_config", OPTIONAL_ARGS, _xine_save_config, \
+ "Save a config file (filename is optional).", \
+ "xine_save_config [filename]" \
+ }, \
+ { "xine_reset_config", NO_ARGS, _xine_reset_config, \
+ "Reset the config object.", \
+ "xine_reset_config" \
+ }, \
{ "xine_get_version", NO_ARGS, _xine_get_version, \
"Get major/minor/sub version numbers.", \
"xine_get_version" \
@@ -438,6 +473,7 @@
/////
TODO CONFIG
+
const char *xine_config_register_string (xine_p self,
const char *key,
const char *def_value,
@@ -485,16 +521,6 @@
xine_config_cb_t changed_cb,
void *cb_data);
-xine_cfg_entry_t *xine_config_get_first_entry (xine_p self);
-xine_cfg_entry_t *xine_config_get_next_entry (xine_p self);
-xine_cfg_entry_t *xine_config_lookup_entry (xine_p self, const char *key);
-void xine_config_update_entry (xine_p self,
- xine_cfg_entry_t *entry);
-void xine_load_config (xine_p self,
- const char *cfg_filename);
-void xine_save_config (xine_p self,
- const char *cfg_filename);
-void xine_reset_config (xine_p self);
int xine_register_event_listener (xine_p self,
xine_event_listener_cb_t listener,
void *user_data);
|
|
From: Daniel Caujolle-B. <f1...@us...> - 2002-09-20 14:16:46
|
Update of /cvsroot/toxine/toxine/doc/man/en In directory usw-pr-cvs1:/tmp/cvs-serv20487/doc/man/en Modified Files: toxine.1 Log Message: Implement xine_config* function (and dumpconfig). Index: toxine.1 =================================================================== RCS file: /cvsroot/toxine/toxine/doc/man/en/toxine.1,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- toxine.1 1 Sep 2002 12:33:16 -0000 1.17 +++ toxine.1 20 Sep 2002 14:16:40 -0000 1.18 @@ -1,7 +1,7 @@ .\" -*-Nroff-*- .\"" .\"" -.TH TOXINE 1x 2002-10-01 "toxine" +.TH TOXINE 1x 2002-09-20 "toxine" .SH NAME toxine \- a text program, using xine library. .SH SYNOPSIS @@ -177,50 +177,44 @@ .br .br .TP -.BR config +.BR display .br .BR action: .br -Manage xine's config stuff. +Display some status .br .BR syntax: .br -\ \ config read <filename> -.br -\ \ config save -.br -\ \ config lookup <key> +\ \ display current <[position | time]> .br -\ \ config dump +\ \ display settings .br .br .TP -.BR display +.BR down .br .BR action: .br -Display some status +send XINE_EVENT_INPUT_DOWN event to xine engine .br .BR syntax: .br -\ \ display current <[position | time]> -.br -\ \ display settings +\ \ down .br .br .TP -.BR down +.BR dumpconfig .br .BR action: .br -send XINE_EVENT_INPUT_DOWN event to xine engine +Dump all entries of current config object. .br .BR syntax: .br -\ \ down +\ \ dumpconfig .br .br .TP @@ -749,413 +743,372 @@ .BR syntax: .br -\ \ waitfor <[MOUSE_BUTTON | MOUSE_MOVE | SPU_BUTTON | SPU_CLUT | UI_CHANNELS_CHANGED | UI_SET_TITLE | INPUT_MENU1 | INPUT_MENU2 | INPUT_MENU3 | INPUT_UP | INPUT_DOWN | INPUT_LEFT | INPUT_RIGHT | INPUT_SELECT | PLAYBACK_FINISHED | BRANCHED | NEED_NEXT_MRL | INPUT_NEXT | INPUT_PREVIOUS | INPUT_ANGLE_NEXT | INPUT_ANGLE_PREVIOUS | SPU_FORCEDISPLAY | FRAME_CHANGE | CLOSED_CAPTION | INPUT_BUTTON_FORCE | INPUT_MENU4 | INPUT_MENU5 | INPUT_MENU6 | INPUT_MENU7 | INPUT_NUMBER_0 | INPUT_NUMBER_1 | INPUT_NUMBER_2 | INPUT_NUMBER_3 | INPUT_NUMBER_4 | INPUT_NUMBER_5 | INPUT_NUMBER_6 | INPUT_NUMBER_7 | INPUT_NUMBER_8 | INPUT_NUMBER_9 | INPUT_NUMBER_10_ADD | ASPECT_CHANGE | OUTPUT_VIDEO | OUTPUT_NO_VIDEO | FOREVER | NOTHING]> +\ \ waitfor <[MOUSE_BUTTON | MOUSE_MOVE | SPU_BUTTON | SPU_CLUT | UI_CHANNELS_CHANGED | UI_SET_TITLE | INPUT_MENU1 | INPUT_MENU2 | INPUT_MENU3 | INPUT_UP | INPUT_DOWN | INPUT_LEFT | INPUT_RIGHT | INPUT_SELECT | PLAYBACK_FINISHED | BRANCHED | NEED_NEXT_MRL | INPUT_NEXT | INPUT_PREVIOUS | INPUT_ANGLE_NEXT | INPUT_ANGLE_PREVIOUS | SPU_FORCEDISPLAY | FRAME_CHANGE | CLOSED_CAPTION | INPUT_BUTTON_FORCE | INPUT_MENU4 | INPUT_MENU5 | INPUT_MENU6 | INPUT_MENU7 | INPUT_NUMBER_0 | INPUT_NUMBER_1 | INPUT_NUMBER_2 | INPUT_NUMBER_3 | INPUT_NUMBER_4 | INPUT_NUMBER_5 | INPUT_NUMBER_6 | INPUT_NUMBER_7 | INPUT_NUMBER_8 | INPUT_NUMBER_9 | INPUT_NUMBER_10_ADD | ASPECT_CHANGE | OUTPUT_VIDEO | OUTPUT_NO_VIDEO | UI_MESSAGE | FOREVER | NOTHING]> .br \ \ waitfor status <[PLAY | STOP | QUIT | PAUSE | SLOW_4 | SLOW_2 | NORMAL | FAST_2 | FAST_4]> .br .br .TP -.BR xine_check_version +.BR xine_new .br .BR action: .br -Compare version numbers with xine installed version. +Create a new xine instance. .br .BR syntax: .br -\ \ xine_check_version <major>.<minor>.<sub> +\ \ xine_new .br .br .TP -.BR xine_eject +.BR xine_init .br .BR action: .br -Tell current input plugin to eject media. +Initialize xine engine. .br .BR syntax: .br -\ \ xine_eject -.br -.br -.TP -.BR xine_exit -.br -.BR action: -.br -Deinitialize xine engine.xine_exit +\ \ xine_init .br - .br .TP -.BR xine_get_audio_capabilities +.BR xine_open .br .BR action: .br -Get audio driver capabilities +Open a new stream. .br .BR syntax: .br -\ \ xine_get_audio_capabilities +\ \ xine_open .br .br .TP -.BR xine_get_audio_lang +.BR xine_play .br .BR action: .br -Get current audio channel language +Start playback of a stream .br .BR syntax: .br -\ \ xine_get_audio_lang -.br -.br -.TP -.BR xine_get_audio_property +\ \ xine_play .br -.BR action: +\ \ xine_play mrl <mrl> .br -Get an audio property +\ \ xine_play start <start> .br - -.BR syntax: +\ \ xine_play time <time> .br -\ \ xine_get_audio_property <property> +\ \ xine_play mrl <mrl> start <start> .br -\ \ \- property can be: [AO_PROP_MIXER_VOL | AO_PROP_PCM_VOL | AO_PROP_MUTE_VOL] +\ \ xine_play mrl <mrl> time <time>. .br .br .TP -.BR xine_get_audio_selection +.BR xine_trick_mode .br .BR action: .br -Get current audio channel +trick mode. .br .BR syntax: .br -\ \ xine_get_audio_selection -.br -.br -.TP -.BR xine_get_autoplay_input_plugin_ids -.br -.BR action: -.br -Get list of autoplay input plugins identifiers. +\ \ xine_trick_mode <mode> <value> .br - -.BR syntax: +\ \ \- mode can be: .br -\ \ xine_get_autoplay_input_plugin_ids +\ \ [XINE_TRICK_MODE_OFF | XINE_TRICK_MODE_OFF | XINE_TRICK_MODE_SEEK_TO_POSITION | XINE_TRICK_MODE_SEEK_TO_TIME | XINE_TRICK_MODE_FAST_FORWARD | XINE_TRICK_MODE_FAST_REWIND] .br .br .TP -.BR xine_get_autoplay_mrls +.BR xine_get_stream_info .br .BR action: .br -Get autoplay MRL list from an input plugin. +get stream info. .br .BR syntax: .br -\ \ xine_get_autoplay_mrls <plugin id> +\ \ xine_get_stream_info .br .br .TP -.BR xine_get_av_offset +.BR xine_stop .br .BR action: .br -Return the current audio/video sync offset. +Stop playback .br .BR syntax: .br -\ \ xine_get_av_offset +\ \ xine_stop .br .br .TP -.BR xine_get_browsable_input_plugin_ids +.BR xine_eject .br .BR action: .br -Get list of browsable input plugins. +Tell current input plugin to eject media. .br .BR syntax: .br -\ \ xine_get_browsable_input_plugin_ids +\ \ xine_eject .br .br .TP -.BR xine_get_browse_mrls +.BR xine_exit .br .BR action: .br -Asks input plugin named <plugin_id> to return -.br -\ \ a list of available MRLs in domain/directory <start_mrl>. -.br -\ \ <start_mrl> may be NULL indicating the toplevel domain/dir -.br -\ \ returns <start_mrl> if <start_mrl> is a valid MRL, not a directory -.br -\ \ returns NULL if <start_mrl> is an invalid MRL, not even a directory. +Deinitialize xine engine.xine_exit .br -.BR syntax: -.br -\ \ xine_get_browse_mrls <plugin id> [start mrl | NULL] -.br .br .TP -.BR xine_get_current_position +.BR xine_get_error .br .BR action: .br -Get current position in stream. +get error .br .BR syntax: .br -\ \ xine_get_current_position +\ \ xine_get_error .br .br .TP -.BR xine_get_current_time +.BR xine_get_status .br .BR action: .br -Get current position measured in seconds from the beginning of the stream. +Return the current state of xine engine. .br .BR syntax: .br -\ \ xine_get_current_time +\ \ xine_get_status .br .br .TP -.BR xine_get_input_plugin_capabilities +.BR xine_get_param .br .BR action: .br -Request input plugin capabilities. +Get parameter value. .br .BR syntax: .br -\ \ xine_get_input_plugin_capabilities +\ \ xine_get_param <parameter> +.br +\ \ \- parameter can be: +.br +\ \ [XINE_PARAM_SPEED | XINE_PARAM_AV_OFFSET | XINE_PARAM_AUDIO_CHANNEL_LOGICAL | XINE_PARAM_AUDIO_CHANNEL_LOGICAL | XINE_PARAM_SPU_CHANNEL | XINE_PARAM_VIDEO_CHANNEL | XINE_PARAM_AUDIO_VOLUME | XINE_PARAM_AUDIO_MUTE | XINE_PARAM_AUDIO_COMPR_LEVEL | XINE_PARAM_AUDIO_AMP_LEVEL | XINE_PARAM_AUDIO_REPORT_LEVEL | XINE_PARAM_VO_DEINTERLACE | XINE_PARAM_VO_ASPECT_RATIO | XINE_PARAM_VO_HUE | XINE_PARAM_VO_SATURATION | XINE_PARAM_VO_CONTRAST | XINE_PARAM_VO_BRIGHTNESS | XINE_PARAM_VO_ZOOM_X | XINE_PARAM_VO_ZOOM_Y | XINE_PARAM_VO_PAN_SCAN | XINE_PARAM_VO_TVMODE | XINE_PARAM_AO_MIXER_VOL | XINE_PARAM_AO_PCM_VOL | XINE_PARAM_AO_MUTE] .br .br .TP -.BR xine_get_input_plugin_description +.BR xine_set_param .br .BR action: .br -Description string. +Set parameter value. .br .BR syntax: .br -\ \ xine_get_input_plugin_description <plugin id> +\ \ xine_set_param <parameter> <value> .br +\ \ \- parameter can be: .br -.TP -.BR xine_get_major_version +\ \ [XINE_PARAM_SPEED | XINE_PARAM_AV_OFFSET | XINE_PARAM_AUDIO_CHANNEL_LOGICAL | XINE_PARAM_AUDIO_CHANNEL_LOGICAL | XINE_PARAM_SPU_CHANNEL | XINE_PARAM_VIDEO_CHANNEL | XINE_PARAM_AUDIO_VOLUME | XINE_PARAM_AUDIO_MUTE | XINE_PARAM_AUDIO_COMPR_LEVEL | XINE_PARAM_AUDIO_AMP_LEVEL | XINE_PARAM_AUDIO_REPORT_LEVEL | XINE_PARAM_VO_DEINTERLACE | XINE_PARAM_VO_ASPECT_RATIO | XINE_PARAM_VO_HUE | XINE_PARAM_VO_SATURATION | XINE_PARAM_VO_CONTRAST | XINE_PARAM_VO_BRIGHTNESS | XINE_PARAM_VO_ZOOM_X | XINE_PARAM_VO_ZOOM_Y | XINE_PARAM_VO_PAN_SCAN | XINE_PARAM_VO_TVMODE | XINE_PARAM_AO_MIXER_VOL | XINE_PARAM_AO_PCM_VOL | XINE_PARAM_AO_MUTE] .br -.BR action: +\ \ \- value can be: .br -Get major version of xine engine +\ \ for XINE_PARAM_SPEED: .br - -.BR syntax: +\ \ [XINE_SPEED_PAUSE | XINE_SPEED_SLOW_4 | XINE_SPEED_SLOW_2 | XINE_SPEED_NORMAL | XINE_SPEED_FAST_2 | XINE_SPEED_FAST_4 | XINE_SPEED_FAST_4] +.br +\ \ for XINE_PARAM_VO_ASPECT_RATIO: .br -\ \ xine_get_major_version +\ \ [XINE_VO_ASPECT_AUTO | XINE_VO_ASPECT_SQUARE | XINE_VO_ASPECT_4_3 | XINE_VO_ASPECT_ANAMORPHIC | XINE_VO_ASPECT_DVB | XINE_VO_ASPECT_NUM_RATIOS | XINE_VO_ASPECT_PAN_SCAN | XINE_VO_ASPECT_DONT_TOUCH] +.br +\ \ or any numeric value for any parameter. .br .br .TP -.BR xine_get_minor_version +.BR xine_get_audio_lang .br .BR action: .br -Get minor version of xine engine +Get current audio channel language .br .BR syntax: .br -\ \ xine_get_minor_version +\ \ xine_get_audio_lang .br .br .TP -.BR xine_get_speed +.BR xine_get_spu_lang .br .BR action: .br -Get current playback speed. +Get current spu channel language .br .BR syntax: .br -\ \ xine_get_speed +\ \ xine_get_spu_lang .br .br .TP -.BR xine_get_spu_channel +.BR xine_get_pos_length .br .BR action: .br -Get current spu channel +set position length. .br .BR syntax: .br -\ \ xine_get_spu_channel +\ \ xine_get_pos_length .br .br .TP -.BR xine_get_spu_lang +.BR xine_get_log_section_count .br .BR action: .br -Get current spu channel language +xine_get_log_section_count .br .BR syntax: .br -\ \ xine_get_spu_lang +\ \ xine_get_log_section_count .br .br .TP -.BR xine_get_status +.BR xine_get_log_names .br .BR action: .br -Return the current state of xine engine. +xine_get_log_names .br .BR syntax: .br -\ \ xine_get_status +\ \ xine_get_log_names .br .br .TP -.BR xine_get_str_version +.BR xine_log .br .BR action: .br -Get xine string version +xine_log .br .BR syntax: .br -\ \ xine_get_str_version +\ \ xine_log .br .br .TP -.BR xine_get_stream_length +.BR xine_get_log .br .BR action: .br -Estimate length of input stream in seconds. +xine_get_log .br .BR syntax: .br -\ \ xine_get_stream_length +\ \ xine_get_log .br .br .TP -.BR xine_get_sub_version +.BR xine_get_browsable_input_plugin_ids .br .BR action: .br -Get sub version of xine engine +Get list of browsable input plugins. .br .BR syntax: .br -\ \ xine_get_sub_version +\ \ xine_get_browsable_input_plugin_ids .br .br .TP -.BR xine_get_video_capabilities +.BR xine_get_browse_mrls .br .BR action: .br -Get video driver capabilities -.br - -.BR syntax: -.br -\ \ xine_get_video_capabilities +Asks input plugin named <plugin_id> to return .br +\ \ a list of available MRLs in domain/directory <start_mrl>. .br -.TP -.BR xine_get_video_property +\ \ <start_mrl> may be NULL indicating the toplevel domain/dir .br -.BR action: +\ \ returns <start_mrl> if <start_mrl> is a valid MRL, not a directory .br -Get a video property +\ \ returns NULL if <start_mrl> is an invalid MRL, not even a directory. .br .BR syntax: .br -\ \ xine_get_video_property <property> -.br -\ \ \- property can be: -.br -\ \ [VO_PROP_INTERLACED | VO_PROP_ASPECT_RATIO | VO_PROP_HUE | VO_PROP_SATURATION | VO_PROP_CONTRAST | VO_PROP_BRIGHTNESS | VO_PROP_COLORKEY | VO_PROP_AUTOPAINT_COLORKEY | VO_PROP_ZOOM_X | VO_PROP_ZOOM_Y | VO_PROP_PAN_SCAN | VO_PROP_TVMODE | VO_PROP_MAX_NUM_FRAMES | VO_PROP_VO_TYPE] +\ \ xine_get_browse_mrls <plugin id> [start mrl | NULL] .br .br .TP -.BR xine_get_video_property_min_max +.BR xine_get_autoplay_input_plugin_ids .br .BR action: .br -Get a video property min and max values +Get list of autoplay input plugins identifiers. .br .BR syntax: .br -\ \ xine_get_video_property_min_max <property> -.br -\ \ \- property can be: -.br -\ \ [VO_PROP_INTERLACED | VO_PROP_ASPECT_RATIO | VO_PROP_HUE | VO_PROP_SATURATION | VO_PROP_CONTRAST | VO_PROP_BRIGHTNESS | VO_PROP_COLORKEY | VO_PROP_AUTOPAINT_COLORKEY | VO_PROP_ZOOM_X | VO_PROP_ZOOM_Y | VO_PROP_PAN_SCAN | VO_PROP_TVMODE | VO_PROP_MAX_NUM_FRAMES | VO_PROP_VO_TYPE] +\ \ xine_get_autoplay_input_plugin_ids .br .br .TP -.BR xine_init +.BR xine_get_autoplay_mrls .br .BR action: .br -Initialize xine engine. +Get autoplay MRL list from an input plugin. .br .BR syntax: .br -\ \ xine_init +\ \ xine_get_autoplay_mrls <plugin id> .br .br .TP -.BR xine_is_stream_seekable +.BR xine_get_input_plugin_description .br .BR action: .br -check if the stream is seekable. +Description string. .br .BR syntax: .br -\ \ xine_is_stream_seekable +\ \ xine_get_input_plugin_description <plugin id> .br .br .TP @@ -1181,152 +1134,141 @@ .BR syntax: .br -\ \ xine_list_video_output_plugins [visual type] -.br -\ \ visual can be: [VISUAL_TYPE_X11 | VISUAL_TYPE_AA | VISUAL_TYPE_FB | VISUAL_TYPE_GTK | VISUAL_TYPE_DFB] +\ \ xine_list_video_output_plugins .br .br .TP -.BR xine_play +.BR xine_send_event .br .BR action: .br -Start playback of a stream +Send an event to the engine. .br .BR syntax: .br -\ \ xine_play -.br -\ \ xine_play mrl <mrl> -.br -\ \ xine_play start <start> -.br -\ \ xine_play time <time> +\ \ xine_send_event <event> .br -\ \ xine_play mrl <mrl> start <start> +\ \ \- event can be: .br -\ \ xine_play mrl <mrl> time <time>. +\ \ [XINE_EVENT_MOUSE_BUTTON | XINE_EVENT_MOUSE_MOVE | XINE_EVENT_SPU_BUTTON | XINE_EVENT_SPU_CLUT | XINE_EVENT_UI_CHANNELS_CHANGED | XINE_EVENT_UI_SET_TITLE | XINE_EVENT_INPUT_MENU1 | XINE_EVENT_INPUT_MENU2 | XINE_EVENT_INPUT_MENU3 | XINE_EVENT_INPUT_UP | XINE_EVENT_INPUT_DOWN | XINE_EVENT_INPUT_LEFT | XINE_EVENT_INPUT_RIGHT | XINE_EVENT_INPUT_SELECT | XINE_EVENT_PLAYBACK_FINISHED | XINE_EVENT_BRANCHED | XINE_EVENT_NEED_NEXT_MRL | XINE_EVENT_INPUT_NEXT | XINE_EVENT_INPUT_PREVIOUS | XINE_EVENT_INPUT_ANGLE_NEXT | XINE_EVENT_INPUT_ANGLE_PREVIOUS | XINE_EVENT_SPU_FORCEDISPLAY | XINE_EVENT_FRAME_CHANGE | XINE_EVENT_CLOSED_CAPTION | XINE_EVENT_INPUT_BUTTON_FORCE | XINE_EVENT_INPUT_MENU4 | XINE_EVENT_INPUT_MENU5 | XINE_EVENT_INPUT_MENU6 | XINE_EVENT_INPUT_MENU7 | XINE_EVENT_INPUT_NUMBER_0 | XINE_EVENT_INPUT_NUMBER_1 | XINE_EVENT_INPUT_NUMBER_2 | XINE_EVENT_INPUT_NUMBER_3 | XINE_EVENT_INPUT_NUMBER_4 | XINE_EVENT_INPUT_NUMBER_5 | XINE_EVENT_INPUT_NUMBER_6 | XINE_EVENT_INPUT_NUMBER_7 | XINE_EVENT_INPUT_NUMBER_8 | XINE_EVENT_INPUT_NUMBER_9 | XINE_EVENT_INPUT_NUMBER_10_ADD | XINE_EVENT_ASPECT_CHANGE | XINE_EVENT_OUTPUT_VIDEO | XINE_EVENT_OUTPUT_NO_VIDEO] .br .br .TP -.BR xine_select_audio_channel +.BR xine_config_get_first_entry .br .BR action: .br -Select audio channel +Get first entry in xine config object. .br .BR syntax: .br -\ \ xine_select_audio_channel <channel> +\ \ _xine_config_get_first_entry .br .br .TP -.BR xine_select_spu_channel +.BR xine_config_get_next_entry .br .BR action: .br -Select spu channel +Get next entry in xine config object. .br .BR syntax: .br -\ \ xine_select_spu_channel <channel> +\ \ _xine_config_get_next_entry .br .br .TP -.BR xine_send_event +.BR xine_config_lookup_entry .br .BR action: .br -Send an event to the engine. +Retrieve config entry matching with a keystring. .br .BR syntax: .br -\ \ xine_send_event <event> -.br -\ \ \- event can be: -.br -\ \ [XINE_EVENT_MOUSE_BUTTON | XINE_EVENT_MOUSE_MOVE | XINE_EVENT_SPU_BUTTON | XINE_EVENT_SPU_CLUT | XINE_EVENT_UI_CHANNELS_CHANGED | XINE_EVENT_UI_SET_TITLE | XINE_EVENT_INPUT_MENU1 | XINE_EVENT_INPUT_MENU2 | XINE_EVENT_INPUT_MENU3 | XINE_EVENT_INPUT_UP | XINE_EVENT_INPUT_DOWN | XINE_EVENT_INPUT_LEFT | XINE_EVENT_INPUT_RIGHT | XINE_EVENT_INPUT_SELECT | XINE_EVENT_PLAYBACK_FINISHED | XINE_EVENT_BRANCHED | XINE_EVENT_NEED_NEXT_MRL | XINE_EVENT_INPUT_NEXT | XINE_EVENT_INPUT_PREVIOUS | XINE_EVENT_INPUT_ANGLE_NEXT | XINE_EVENT_INPUT_ANGLE_PREVIOUS | XINE_EVENT_SPU_FORCEDISPLAY | XINE_EVENT_FRAME_CHANGE | XINE_EVENT_CLOSED_CAPTION | XINE_EVENT_INPUT_BUTTON_FORCE | XINE_EVENT_INPUT_MENU4 | XINE_EVENT_INPUT_MENU5 | XINE_EVENT_INPUT_MENU6 | XINE_EVENT_INPUT_MENU7 | XINE_EVENT_INPUT_NUMBER_0 | XINE_EVENT_INPUT_NUMBER_1 | XINE_EVENT_INPUT_NUMBER_2 | XINE_EVENT_INPUT_NUMBER_3 | XINE_EVENT_INPUT_NUMBER_4 | XINE_EVENT_INPUT_NUMBER_5 | XINE_EVENT_INPUT_NUMBER_6 | XINE_EVENT_INPUT_NUMBER_7 | XINE_EVENT_INPUT_NUMBER_8 | XINE_EVENT_INPUT_NUMBER_9 | XINE_EVENT_INPUT_NUMBER_10_ADD | XINE_EVENT_ASPECT_CHANGE | XINE_EVENT_OUTPUT_VIDEO | XINE_EVENT_OUTPUT_NO_VIDEO] +\ \ _xine_config_lookup_entry <key> .br .br .TP -.BR xine_set_audio_property +.BR xine_config_update_entry .br .BR action: .br -Set audio properties +Update value of specified entry. .br .BR syntax: .br -\ \ xine_set_audio_property <property> <value> +\ \ _xine_config_update_entry <key> <value> +.br .br -\ \ \- property can be: [AO_PROP_MIXER_VOL | AO_PROP_PCM_VOL | AO_PROP_MUTE_VOL] +.TP +.BR xine_load_config .br -\ \ xine_set_audio_property volume <level> +.BR action: .br -\ \ xine_set_audio_property mute +Load a config file (filename is optional). +.br + +.BR syntax: +.br +\ \ xine_load_config [filename] .br .br .TP -.BR xine_set_av_offset +.BR xine_save_config .br .BR action: .br -Set audio/video sync offset, according to offset pts value. +Save a config file (filename is optional). .br .BR syntax: .br -\ \ xine_set_av_offset <offset pts> +\ \ xine_save_config [filename] .br .br .TP -.BR xine_set_speed +.BR xine_reset_config .br .BR action: .br -Set playback speed. +Reset the config object. .br .BR syntax: .br -\ \ xine_set_speed <value> -.br -\ \ xine_set_speed <constant name> [SPEED_PAUSE | SPEED_SLOW_4 | SPEED_SLOW_2 | SPEED_NORMAL | SPEED_FAST_2 | SPEED_FAST_4] +\ \ xine_reset_config .br .br .TP -.BR xine_set_video_property +.BR xine_get_version .br .BR action: .br -Set a video property to a value +Get major/minor/sub version numbers. .br .BR syntax: .br -\ \ xine_set_video_property <property> <value> -.br -\ \ \- property can be: -.br -\ \ [VO_PROP_INTERLACED | VO_PROP_ASPECT_RATIO | VO_PROP_HUE | VO_PROP_SATURATION | VO_PROP_CONTRAST | VO_PROP_BRIGHTNESS | VO_PROP_COLORKEY | VO_PROP_AUTOPAINT_COLORKEY | VO_PROP_ZOOM_X | VO_PROP_ZOOM_Y | VO_PROP_PAN_SCAN | VO_PROP_TVMODE | VO_PROP_MAX_NUM_FRAMES | VO_PROP_VO_TYPE] +\ \ xine_get_version .br .br .TP -.BR xine_stop +.BR xine_check_version .br .BR action: .br -Stop playback +Compare version numbers with xine installed version. .br .BR syntax: .br -\ \ xine_stop +\ \ xine_check_version <major>.<minor>.<sub> .br .br .TP |
