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.c5
-rw-r--r--src/xine-engine/broadcaster.c13
-rw-r--r--src/xine-engine/buffer_types.c8
-rw-r--r--src/xine-engine/configfile.c2
-rw-r--r--src/xine-engine/input_rip.c3
-rw-r--r--src/xine-engine/load_plugins.c2
-rw-r--r--src/xine-engine/osd.c8
-rw-r--r--src/xine-engine/video_overlay.c3
-rw-r--r--src/xine-engine/xine_interface.c4
9 files changed, 23 insertions, 25 deletions
diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c
index cd87c2947..d39c99aba 100644
--- a/src/xine-engine/audio_out.c
+++ b/src/xine-engine/audio_out.c
@@ -174,7 +174,7 @@ typedef struct {
}sXYData;
-static sIIRCoefficients iir_cf[] = {
+static const sIIRCoefficients iir_cf[] = {
/* 31 Hz*/
{ EQ_REAL(9.9691562441e-01), EQ_REAL(1.5421877947e-03), EQ_REAL(1.9968961468e+00) },
/* 62 Hz*/
@@ -281,11 +281,12 @@ typedef struct {
struct audio_fifo_s {
audio_buffer_t *first;
audio_buffer_t *last;
- int num_buffers;
pthread_mutex_t mutex;
pthread_cond_t not_empty;
pthread_cond_t empty;
+
+ int num_buffers;
};
diff --git a/src/xine-engine/broadcaster.c b/src/xine-engine/broadcaster.c
index 3beacb226..30cdadc7c 100644
--- a/src/xine-engine/broadcaster.c
+++ b/src/xine-engine/broadcaster.c
@@ -73,9 +73,10 @@ struct broadcaster_s {
int msock; /* master network socket */
xine_list_t *connections; /* active connections */
- int running;
pthread_t manager_thread;
pthread_mutex_t lock;
+
+ int running;
};
@@ -136,10 +137,7 @@ static int sock_data_write(xine_t *xine, int socket, char *buf, int len) {
return wlen;
}
-static int
-#ifdef __GNUC__
-__attribute__((format (printf, 3, 4)))
-#endif
+static int XINE_FORMAT_PRINTF(3, 4)
sock_string_write(xine_t *xine, int socket, char *msg, ...) {
char buf[_BUFSIZ];
va_list args;
@@ -181,10 +179,7 @@ static void broadcaster_data_write(broadcaster_t *this, char *buf, int len) {
}
}
-static void
-#ifdef __GNUC__
-__attribute__((format (printf, 2, 3)))
-#endif
+static void XINE_FORMAT_PRINTF(2, 3)
broadcaster_string_write(broadcaster_t *this, char *msg, ...) {
char buf[_BUFSIZ];
va_list args;
diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c
index 161ec70a9..619a34c4c 100644
--- a/src/xine-engine/buffer_types.c
+++ b/src/xine-engine/buffer_types.c
@@ -49,17 +49,17 @@
typedef struct video_db_s {
uint32_t fourcc[20];
uint32_t buf_type;
- char *name;
+ const char *name;
} video_db_t;
typedef struct audio_db_s {
uint32_t formattag[10];
uint32_t buf_type;
- char *name;
+ const char *name;
} audio_db_t;
-static video_db_t video_db[] = {
+static const video_db_t video_db[] = {
{
{
meFOURCC('m', 'p', 'e', 'g'),
@@ -767,7 +767,7 @@ static video_db_t video_db[] = {
};
-static audio_db_t audio_db[] = {
+static const audio_db_t audio_db[] = {
{
{
0x2000,
diff --git a/src/xine-engine/configfile.c b/src/xine-engine/configfile.c
index 28b44fd51..ec5f5c856 100644
--- a/src/xine-engine/configfile.c
+++ b/src/xine-engine/configfile.c
@@ -51,7 +51,7 @@ typedef struct {
const char *new;
} config_entry_translation_t;
-static config_entry_translation_t config_entry_translation[] = {
+static const config_entry_translation_t config_entry_translation[] = {
{ "audio.a52_pass_through", "" },
{ "audio.alsa_a52_device", "audio.device.alsa_passthrough_device" },
{ "audio.alsa_default_device", "audio.device.alsa_default_device" },
diff --git a/src/xine-engine/input_rip.c b/src/xine-engine/input_rip.c
index d8715fb85..56850ba2d 100644
--- a/src/xine-engine/input_rip.c
+++ b/src/xine-engine/input_rip.c
@@ -83,12 +83,13 @@ typedef struct {
xine_stream_t *stream;
FILE *file; /* destination file */
- int regular; /* permit reading from the file */
char *preview; /* preview data */
off_t preview_size; /* size of read preview data */
off_t curpos; /* current position */
off_t savepos; /* amount of already saved data */
+
+ int regular; /* permit reading from the file */
} rip_input_plugin_t;
diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c
index d35eba736..c72241487 100644
--- a/src/xine-engine/load_plugins.c
+++ b/src/xine-engine/load_plugins.c
@@ -96,7 +96,7 @@ static void remove_segv_handler(void){
#endif /* 0 */
-static int plugin_iface_versions[] = {
+static const int plugin_iface_versions[] = {
INPUT_PLUGIN_IFACE_VERSION,
DEMUXER_PLUGIN_IFACE_VERSION,
AUDIO_DECODER_IFACE_VERSION,
diff --git a/src/xine-engine/osd.c b/src/xine-engine/osd.c
index b33d81f6e..b68b3b5c2 100644
--- a/src/xine-engine/osd.c
+++ b/src/xine-engine/osd.c
@@ -109,21 +109,21 @@
#endif
typedef struct osd_fontchar_s {
+ uint8_t *bmp;
uint16_t code;
uint16_t width;
uint16_t height;
- uint8_t *bmp;
} osd_fontchar_t;
struct osd_font_s {
char name[40];
char *filename;
+ osd_fontchar_t *fontchar;
+ osd_font_t *next;
uint16_t version;
uint16_t size;
uint16_t num_fontchars;
- osd_fontchar_t *fontchar;
- osd_font_t *next;
- int loaded;
+ uint16_t loaded;
};
#ifdef HAVE_FT2
diff --git a/src/xine-engine/video_overlay.c b/src/xine-engine/video_overlay.c
index 3189214a8..7bd9292c8 100644
--- a/src/xine-engine/video_overlay.c
+++ b/src/xine-engine/video_overlay.c
@@ -51,6 +51,8 @@ typedef struct video_overlay_showing_s {
typedef struct video_overlay_s {
video_overlay_manager_t video_overlay;
+ xine_t *xine;
+
pthread_mutex_t events_mutex;
video_overlay_events_t events[MAX_EVENTS];
pthread_mutex_t objects_mutex;
@@ -58,7 +60,6 @@ typedef struct video_overlay_s {
pthread_mutex_t showing_mutex;
video_overlay_showing_t showing[MAX_SHOWING];
int showing_changed;
- xine_t *xine;
} video_overlay_t;
diff --git a/src/xine-engine/xine_interface.c b/src/xine-engine/xine_interface.c
index e58d9ed61..166d7a3ef 100644
--- a/src/xine-engine/xine_interface.c
+++ b/src/xine-engine/xine_interface.c
@@ -521,7 +521,7 @@ void xine_set_param (xine_stream_t *stream, int param, int value) {
break;
case XINE_PARAM_EARLY_FINISHED_EVENT:
- stream->early_finish_event = value;
+ stream->early_finish_event = !!value;
break;
case XINE_PARAM_DELAY_FINISHED_EVENT:
@@ -529,7 +529,7 @@ void xine_set_param (xine_stream_t *stream, int param, int value) {
break;
case XINE_PARAM_GAPLESS_SWITCH:
- stream->gapless_switch = value;
+ stream->gapless_switch = !!value;
break;
default:
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-29 20:37:41 +0000