summaryrefslogtreecommitdiff
path: root/src/xine-engine
diff options
context:
space:
mode:
Diffstat (limited to 'src/xine-engine')
-rw-r--r--src/xine-engine/audio_out.h10
-rw-r--r--src/xine-engine/buffer.h10
-rw-r--r--src/xine-engine/configfile.h17
-rw-r--r--src/xine-engine/cpu_accel.h8
-rw-r--r--src/xine-engine/events.h8
-rw-r--r--src/xine-engine/metronom.h11
-rw-r--r--src/xine-engine/monitor.h10
-rw-r--r--src/xine-engine/spu_decoder.h10
-rw-r--r--src/xine-engine/utils.h10
-rw-r--r--src/xine-engine/video_out.h10
-rw-r--r--src/xine-engine/xine_internal.h11
11 files changed, 102 insertions, 13 deletions
diff --git a/src/xine-engine/audio_out.h b/src/xine-engine/audio_out.h
index 6b4e7a173..e66419271 100644
--- a/src/xine-engine/audio_out.h
+++ b/src/xine-engine/audio_out.h
@@ -17,11 +17,15 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: audio_out.h,v 1.6 2001/06/23 19:45:47 guenter Exp $
+ * $Id: audio_out.h,v 1.7 2001/07/18 21:38:17 f1rmb Exp $
*/
#ifndef HAVE_AUDIO_OUT_H
#define HAVE_AUDIO_OUT_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#include <inttypes.h>
#if defined(XINE_COMPILE)
@@ -153,4 +157,8 @@ typedef struct ao_info_s {
int priority;
} ao_info_t ;
+#ifdef __cplusplus
+}
+#endif
+
#endif
diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h
index 8c972562e..6f9aeb9a0 100644
--- a/src/xine-engine/buffer.h
+++ b/src/xine-engine/buffer.h
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: buffer.h,v 1.4 2001/07/13 23:43:13 jcdutton Exp $
+ * $Id: buffer.h,v 1.5 2001/07/18 21:38:17 f1rmb Exp $
*
*
* contents:
@@ -34,6 +34,10 @@
#ifndef HAVE_BUFFER_H
#define HAVE_BUFFER_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#include <stdio.h>
#include <pthread.h>
#include <inttypes.h>
@@ -150,4 +154,8 @@ struct fifo_buffer_s
fifo_buffer_t *fifo_buffer_new (int num_buffers, uint32_t buf_size);
+#ifdef __cplusplus
+}
+#endif
+
#endif
diff --git a/src/xine-engine/configfile.h b/src/xine-engine/configfile.h
index 1e5de7be9..fc1b3c829 100644
--- a/src/xine-engine/configfile.h
+++ b/src/xine-engine/configfile.h
@@ -17,16 +17,19 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: configfile.h,v 1.1 2001/04/18 22:36:05 f1rmb Exp $
+ * $Id: configfile.h,v 1.2 2001/07/18 21:38:17 f1rmb Exp $
*
* config file management
*
*/
-
#ifndef HAVE_CONFIGFILE_H
#define HAVE_CONFIGFILE_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#include <inttypes.h>
typedef struct config_values_s config_values_t;
@@ -76,13 +79,19 @@ struct config_values_s {
*/
config_values_t *config_file_init (char *filename);
+#ifdef __cplusplus
+}
+#endif
#endif
/*
* $Log: configfile.h,v $
- * Revision 1.1 2001/04/18 22:36:05 f1rmb
- * Initial revision
+ * Revision 1.2 2001/07/18 21:38:17 f1rmb
+ * Split alsa drivers, more checks about versions. Made xine lib c++ compliant.
+ *
+ * Revision 1.1.1.1 2001/04/18 22:36:05 f1rmb
+ * Initial import into CVS
*
* Revision 1.6 2001/03/31 03:42:25 guenter
* more cleanups, started xv driver
diff --git a/src/xine-engine/cpu_accel.h b/src/xine-engine/cpu_accel.h
index 9583b6681..d563787eb 100644
--- a/src/xine-engine/cpu_accel.h
+++ b/src/xine-engine/cpu_accel.h
@@ -31,6 +31,10 @@
#ifndef _CPU_ACCEL_H
#define _CPU_ACCEL_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#include "attributes.h"
/* generic accelerations */
@@ -510,5 +514,9 @@ typedef union {
: "X" (mem))
#endif /*ARCH_X86 */
+#ifdef __cplusplus
+}
+#endif
+
#endif
diff --git a/src/xine-engine/events.h b/src/xine-engine/events.h
index eeda3320e..c812d7960 100644
--- a/src/xine-engine/events.h
+++ b/src/xine-engine/events.h
@@ -24,6 +24,10 @@
#ifndef HAVE_EVENTS_H
#define HAVE_EVENTS_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#include <inttypes.h>
/**
@@ -49,4 +53,8 @@ typedef struct mouse_event_s {
uint16_t x,y; /* In Image space */
} mouse_event_t;
+#ifdef __cplusplus
+}
+#endif
+
#endif /* HAVE_EVENTS_H */
diff --git a/src/xine-engine/metronom.h b/src/xine-engine/metronom.h
index 49058124c..1709a85c1 100644
--- a/src/xine-engine/metronom.h
+++ b/src/xine-engine/metronom.h
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: metronom.h,v 1.7 2001/07/08 18:15:54 guenter Exp $
+ * $Id: metronom.h,v 1.8 2001/07/18 21:38:17 f1rmb Exp $
*
* metronom: general pts => virtual calculation/assoc
*
@@ -28,10 +28,13 @@
*
*/
-
#ifndef HAVE_METRONOM_H
#define HAVE_METRONOM_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#include <inttypes.h>
#include <sys/time.h>
#include <pthread.h>
@@ -197,4 +200,8 @@ struct metronom_s {
metronom_t *metronom_init (int have_audio);
+#ifdef __cplusplus
+}
+#endif
+
#endif
diff --git a/src/xine-engine/monitor.h b/src/xine-engine/monitor.h
index f4033a1d5..38c1be91a 100644
--- a/src/xine-engine/monitor.h
+++ b/src/xine-engine/monitor.h
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: monitor.h,v 1.2 2001/07/04 17:10:24 uid32519 Exp $
+ * $Id: monitor.h,v 1.3 2001/07/18 21:38:17 f1rmb Exp $
*
* debug print and profiling functions
*
@@ -26,6 +26,10 @@
#ifndef HAVE_MONITOR_H
#define HAVE_MONITOR_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#include <inttypes.h>
extern uint32_t xine_debug;
@@ -86,4 +90,8 @@ void profiler_print_results ();
#endif /* DEBUG*/
+#ifdef __cplusplus
+}
+#endif
+
#endif /* HAVE_MONITOR_H */
diff --git a/src/xine-engine/spu_decoder.h b/src/xine-engine/spu_decoder.h
index 5d1a2d478..108ec35ed 100644
--- a/src/xine-engine/spu_decoder.h
+++ b/src/xine-engine/spu_decoder.h
@@ -19,11 +19,15 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: spu_decoder.h,v 1.3 2001/07/14 12:50:34 guenter Exp $
+ * $Id: spu_decoder.h,v 1.4 2001/07/18 21:38:17 f1rmb Exp $
*/
#ifndef HAVE_SPU_OUT_H
#define HAVE_SPU_OUT_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#include <inttypes.h>
#if defined(XINE_COMPILE)
@@ -133,4 +137,8 @@ typedef struct spu_info_s {
int priority;
} spu_info_t ;
+#ifdef __cplusplus
+}
+#endif
+
#endif
diff --git a/src/xine-engine/utils.h b/src/xine-engine/utils.h
index d68cd0999..f45a41dc6 100644
--- a/src/xine-engine/utils.h
+++ b/src/xine-engine/utils.h
@@ -17,12 +17,16 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: utils.h,v 1.1 2001/04/18 22:36:09 f1rmb Exp $
+ * $Id: utils.h,v 1.2 2001/07/18 21:38:17 f1rmb Exp $
*
*/
#ifndef HAVE_UTILS_H
#define HAVE_UTILS_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
void *xmalloc(size_t size);
void *xmalloc_aligned(size_t alignment, size_t size);
@@ -36,4 +40,8 @@ const char *get_homedir(void);
char *chomp (char *str);
+#ifdef __cplusplus
+}
+#endif
+
#endif
diff --git a/src/xine-engine/video_out.h b/src/xine-engine/video_out.h
index f73f1a707..b1f00f6c6 100644
--- a/src/xine-engine/video_out.h
+++ b/src/xine-engine/video_out.h
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: video_out.h,v 1.12 2001/07/10 19:33:05 guenter Exp $
+ * $Id: video_out.h,v 1.13 2001/07/18 21:38:17 f1rmb Exp $
*
*
* xine version of video_out.h
@@ -27,6 +27,10 @@
#ifndef HAVE_VIDEO_OUT_H
#define HAVE_VIDEO_OUT_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -316,5 +320,9 @@ typedef struct vo_info_s {
} vo_info_t;
+#ifdef __cplusplus
+}
+#endif
+
#endif
diff --git a/src/xine-engine/xine_internal.h b/src/xine-engine/xine_internal.h
index 8b2fac7e8..cf07104fc 100644
--- a/src/xine-engine/xine_internal.h
+++ b/src/xine-engine/xine_internal.h
@@ -17,14 +17,19 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: xine_internal.h,v 1.31 2001/07/15 10:43:35 guenter Exp $
+ * $Id: xine_internal.h,v 1.32 2001/07/18 21:38:17 f1rmb Exp $
*
*/
#ifndef HAVE_XINE_INTERNAL_H
#define HAVE_XINE_INTERNAL_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#include <inttypes.h>
+
#include "input/input_plugin.h"
#include "demuxers/demux.h"
#include "video_out.h"
@@ -459,4 +464,8 @@ void xine_send_event(xine_t *this, event_t *event, void *data);
/** @} end of eventgroup */
+#ifdef __cplusplus
+}
+#endif
+
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-17 13:32:39 +0000