diff options
Diffstat (limited to 'src/xine-engine')
| -rw-r--r-- | src/xine-engine/audio_out.c | 3 | ||||
| -rw-r--r-- | src/xine-engine/broadcaster.c | 3 | ||||
| -rw-r--r-- | src/xine-engine/input_rip.c | 3 | ||||
| -rw-r--r-- | src/xine-engine/osd.c | 8 | ||||
| -rw-r--r-- | src/xine-engine/video_overlay.c | 3 |
5 files changed, 12 insertions, 8 deletions
diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c index cd87c2947..89fbdde1a 100644 --- a/src/xine-engine/audio_out.c +++ b/src/xine-engine/audio_out.c @@ -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..8ab661d3e 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; }; 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/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..04a3034a3 100644 --- a/src/xine-engine/video_overlay.c +++ b/src/xine-engine/video_overlay.c @@ -49,6 +49,8 @@ typedef struct video_overlay_showing_s { typedef struct video_overlay_s { + xine_t *xine; + video_overlay_manager_t video_overlay; pthread_mutex_t events_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; |