[Toxine-cvs] CVS: toxine/src commands.c,1.53,1.54 common.h,1.23,1.24 utils.c,1.22,1.23 xine_commands
Brought to you by:
f1rmb
Menu
▾
▴
[Toxine-cvs] CVS: toxine/src commands.c,1.53,1.54 common.h,1.23,1.24 utils.c,1.22,1.23 xine_commands.c,1.38,1.39 xine_commands.h,1.24,1.25
|
From: Daniel Caujolle-B. <f1...@us...> - 2003-05-22 20:50:39
|
Update of /cvsroot/toxine/toxine/src
In directory sc8-pr-cvs1:/tmp/cvs-serv17186/src
Modified Files:
commands.c common.h utils.c xine_commands.c xine_commands.h
Log Message:
Made it compile with gcc 3.2.2, without warnings.
Made it compile with OrT.
Get rid of Shm completion event.
Index: commands.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/commands.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- commands.c 21 Jan 2003 16:53:34 -0000 1.53
+++ commands.c 22 May 2003 20:50:34 -0000 1.54
@@ -2515,7 +2515,7 @@
}
static void do_dumpconfig(commands_t *command, toxine_t *tox, void *data) {
- xine_cfg_entry_t cfg_entry;
+ _cfg_entry_t cfg_entry;
return_if_no_new(tox);
Index: common.h
===================================================================
RCS file: /cvsroot/toxine/toxine/src/common.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- common.h 21 Jan 2003 16:53:35 -0000 1.23
+++ common.h 22 May 2003 20:50:34 -0000 1.24
@@ -40,6 +40,12 @@
#define __tox_func__ __FUNCTION__
#endif
+#ifdef XINE_ORT
+#define _cfg_entry_t xine_config_entry_t
+#else
+#define _cfg_entry_t xine_cfg_entry_t
+#endif
+
#define INFO_PREFIX " (I) "
#define HELP_PREFIX " (?) "
#define ECHO_PREFIX " (e) "
Index: utils.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/utils.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- utils.c 21 Jan 2003 16:53:35 -0000 1.22
+++ utils.c 22 May 2003 20:50:34 -0000 1.23
@@ -507,7 +507,7 @@
}
#endif
static void _config_update(toxine_t *tox,
- xine_cfg_entry_t *entry,
+ _cfg_entry_t *entry,
int type, int min, int max, int value, char *string) {
switch(type) {
@@ -542,9 +542,9 @@
}
void toxine_config_update_range(toxine_t *tox, char *key, int min, int max) {
- xine_cfg_entry_t entry;
+ _cfg_entry_t entry;
- memset(&entry, 0, sizeof(xine_cfg_entry_t));
+ memset(&entry, 0, sizeof(_cfg_entry_t));
if(xine_config_lookup_entry(tox->xine, key, &entry))
_config_update(tox, &entry, XINE_CONFIG_TYPE_RANGE, min, max, 0, NULL);
else
@@ -552,9 +552,9 @@
}
void toxine_config_update_string(toxine_t *tox, char *key, char *string) {
- xine_cfg_entry_t entry;
+ _cfg_entry_t entry;
- memset(&entry, 0, sizeof(xine_cfg_entry_t));
+ memset(&entry, 0, sizeof(_cfg_entry_t));
if((xine_config_lookup_entry(tox->xine, key, &entry)) && string)
_config_update(tox, &entry, XINE_CONFIG_TYPE_STRING, 0, 0, 0, string);
@@ -567,9 +567,9 @@
}
void toxine_config_update_enum(toxine_t *tox, char *key, int value) {
- xine_cfg_entry_t entry;
+ _cfg_entry_t entry;
- memset(&entry, 0, sizeof(xine_cfg_entry_t));
+ memset(&entry, 0, sizeof(_cfg_entry_t));
if(xine_config_lookup_entry(tox->xine, key, &entry))
_config_update(tox, &entry, XINE_CONFIG_TYPE_ENUM, 0, 0, value, NULL);
else
@@ -577,9 +577,9 @@
}
void toxine_config_update_bool(toxine_t *tox, char *key, int value) {
- xine_cfg_entry_t entry;
+ _cfg_entry_t entry;
- memset(&entry, 0, sizeof(xine_cfg_entry_t));
+ memset(&entry, 0, sizeof(_cfg_entry_t));
if(xine_config_lookup_entry(tox->xine, key, &entry))
_config_update(tox, &entry, XINE_CONFIG_TYPE_BOOL, 0, 0, ((value > 0) ? 1 : 0), NULL);
else
@@ -587,9 +587,9 @@
}
void toxine_config_update_num(toxine_t *tox, char *key, int value) {
- xine_cfg_entry_t entry;
+ _cfg_entry_t entry;
- memset(&entry, 0, sizeof(xine_cfg_entry_t));
+ memset(&entry, 0, sizeof(_cfg_entry_t));
if(xine_config_lookup_entry(tox->xine, key, &entry))
_config_update(tox, &entry, XINE_CONFIG_TYPE_NUM, 0, 0, value, NULL);
else
Index: xine_commands.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/xine_commands.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- xine_commands.c 21 Jan 2003 16:53:36 -0000 1.38
+++ xine_commands.c 22 May 2003 20:50:34 -0000 1.39
@@ -321,7 +321,7 @@
}
-void toxine_dump_config_entry(toxine_t *tox, xine_cfg_entry_t *entry) {
+void toxine_dump_config_entry(toxine_t *tox, _cfg_entry_t *entry) {
pinfo("%s:\n", entry->key);
pinfo(" entry->description: '%s'\n", (entry->description) ? entry->description : "none");
@@ -1678,7 +1678,7 @@
* ****** CONFIG ******
*/
void _xine_config_get_first_entry(commands_t *command, toxine_t *tox, void *data) {
- xine_cfg_entry_t cfg_entry;
+ _cfg_entry_t cfg_entry;
return_if_no_init(tox);
@@ -1691,7 +1691,7 @@
pinfo(".\n");
}
void _xine_config_get_next_entry(commands_t *command, toxine_t *tox, void *data) {
- xine_cfg_entry_t cfg_entry;
+ _cfg_entry_t cfg_entry;
return_if_no_init(tox);
@@ -1705,7 +1705,7 @@
}
void _xine_config_lookup_entry(commands_t *command, toxine_t *tox, void *data) {
const char *key;
- xine_cfg_entry_t cfg_entry;
+ _cfg_entry_t cfg_entry;
return_if_no_init(tox);
@@ -1721,7 +1721,7 @@
void _xine_config_update_entry(commands_t *command, toxine_t *tox, void *data) {
const char *key;
int value;
- xine_cfg_entry_t cfg_entry;
+ _cfg_entry_t cfg_entry;
return_if_no_init(tox);
Index: xine_commands.h
===================================================================
RCS file: /cvsroot/toxine/toxine/src/xine_commands.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- xine_commands.h 21 Jan 2003 16:53:36 -0000 1.24
+++ xine_commands.h 22 May 2003 20:50:34 -0000 1.25
@@ -20,7 +20,7 @@
#ifndef __TOXINE_XINE_COMMANDS_H__
#define __TOXINE_XINE_COMMANDS_H__
-void toxine_dump_config_entry(toxine_t *, xine_cfg_entry_t *);
+void toxine_dump_config_entry(toxine_t *, _cfg_entry_t *);
void _NAPI_xine_dumpstream(toxine_t *tox);
void _xine_new(commands_t *, toxine_t *, void *);
|
