diff options
Diffstat (limited to 'include')
38 files changed, 463 insertions, 449 deletions
diff --git a/include/xine.h b/include/xine.h index 02b49acdc..29c9d6429 100644 --- a/include/xine.h +++ b/include/xine.h @@ -265,7 +265,7 @@ void xine_dispose (xine_stream_t *stream) XINE_PROTECTED; */ void xine_engine_set_param(xine_t *self, int param, int value) XINE_PROTECTED; int xine_engine_get_param(xine_t *self, int param) XINE_PROTECTED; - + #define XINE_ENGINE_PARAM_VERBOSITY 1 /* @@ -307,7 +307,7 @@ int xine_get_param (xine_stream_t *stream, int param) XINE_PROTECTED; #define XINE_PARAM_EQ_16000HZ 27 /* equalizer gains -100..100 */ #define XINE_PARAM_AUDIO_CLOSE_DEVICE 28 /* force closing audio device */ #define XINE_PARAM_AUDIO_AMP_MUTE 29 /* 1=>mute, 0=>unmute */ -#define XINE_PARAM_FINE_SPEED 30 /* 1.000.000 => normal speed */ +#define XINE_PARAM_FINE_SPEED 30 /* 1.000.000 => normal speed */ #define XINE_PARAM_EARLY_FINISHED_EVENT 31 /* send event when demux finish*/ #define XINE_PARAM_GAPLESS_SWITCH 32 /* next stream only gapless swi*/ #define XINE_PARAM_DELAY_FINISHED_EVENT 33 /* 1/10sec,0=>disable,-1=>forev*/ @@ -325,7 +325,7 @@ int xine_get_param (xine_stream_t *stream, int param) XINE_PROTECTED; #define XINE_SPEED_NORMAL 4 #define XINE_SPEED_FAST_2 8 #define XINE_SPEED_FAST_4 16 - + /* normal speed value for XINE_PARAM_FINE_SPEED parameter */ #define XINE_FINE_SPEED_NORMAL 1000000 @@ -387,7 +387,7 @@ int xine_get_param (xine_stream_t *stream, int param) XINE_PROTECTED; * image format can be YUV 4:2:0 or 4:2:2 * will copy the image data into memory that <img> points to * (interleaved for yuv 4:2:2 or planary for 4:2:0) - * + * * xine_get_current_frame() requires that <img> must be able * to hold the image data. Use a NULL pointer to retrieve the * necessary parameters for calculating the buffer size. Be @@ -401,7 +401,7 @@ int xine_get_param (xine_stream_t *stream, int param) XINE_PROTECTED; * xine_get_current_frame_alloc() takes care of allocating * a buffer on its own, so image data can be retrieved by * a single call without the need to pause the stream. - * + * * xine_get_current_frame_data() passes the parameters of the * previously mentioned functions plus further information in * a structure and can work like the _s or _alloc function @@ -548,18 +548,18 @@ struct xine_post_s { * pass them to the initialization of streams */ xine_audio_port_t **audio_input; - + /* a NULL-terminated array of video input ports this post plugin * provides; you can hand these to other post plugin's outputs or * pass them to the initialization of streams */ xine_video_port_t **video_input; - + /* the type of the post plugin * one of XINE_POST_TYPE_* can be used here */ int type; - + }; /* @@ -599,25 +599,25 @@ struct xine_post_in_s { /* the name identifying this input */ const char *name; - + /* the data pointer; input is directed to this memory location, * so you simply access the pointer to access the input data */ void *data; - + /* the datatype of this input, use one of XINE_POST_DATA_* here */ int type; - + }; struct xine_post_out_s { /* the name identifying this output */ const char *name; - + /* the data pointer; output should be directed to this memory location, * so in the easy case you simply write through the pointer */ void *data; - + /* this function is called, when the output should be redirected * to another input, you sould set the data pointer to direct * any output to this new input; @@ -631,7 +631,7 @@ struct xine_post_out_s { /* the datatype of this output, use one of XINE_POST_DATA_* here */ int type; - + }; /* get a list of all inputs of a post plugin */ @@ -941,7 +941,7 @@ const char *xine_get_meta_info (xine_stream_t *stream, int info) XINE_PROTECTE #define XINE_META_INFO_ARTIST 2 #define XINE_META_INFO_GENRE 3 #define XINE_META_INFO_ALBUM 4 -#define XINE_META_INFO_YEAR 5 +#define XINE_META_INFO_YEAR 5 /* may be full date */ #define XINE_META_INFO_VIDEOCODEC 6 #define XINE_META_INFO_AUDIOCODEC 7 #define XINE_META_INFO_SYSTEMLAYER 8 @@ -949,6 +949,20 @@ const char *xine_get_meta_info (xine_stream_t *stream, int info) XINE_PROTECTE #define XINE_META_INFO_CDINDEX_DISCID 10 #define XINE_META_INFO_TRACK_NUMBER 11 #define XINE_META_INFO_COMPOSER 12 +/* post-1.1.17; taken from the list at http://age.hobba.nl/audio/mirroredpages/ogg-tagging.html on 2009-12-11 */ +#define XINE_META_INFO_PUBLISHER 13 +#define XINE_META_INFO_COPYRIGHT 14 +#define XINE_META_INFO_LICENSE 15 +#define XINE_META_INFO_ARRANGER 16 +#define XINE_META_INFO_LYRICIST 17 +#define XINE_META_INFO_AUTHOR 18 +#define XINE_META_INFO_CONDUCTOR 19 +#define XINE_META_INFO_PERFORMER 20 +#define XINE_META_INFO_ENSEMBLE 21 +#define XINE_META_INFO_OPUS 22 +#define XINE_META_INFO_PART 23 +#define XINE_META_INFO_PARTNUMBER 24 +#define XINE_META_INFO_LOCATION 25 /********************************************************************* @@ -1362,7 +1376,7 @@ typedef struct { HWND WndHnd; /* handle of window associated with primary surface */ HINSTANCE HInst; /* handle of windows application instance */ - RECT WndRect; /* rect of window client points translated to screen + RECT WndRect; /* rect of window client points translated to screen * cooridnates */ int FullScreen; /* is window fullscreen */ HBRUSH Brush; /* window brush for background color */ @@ -1453,7 +1467,7 @@ xine_health_check_t* xine_health_check(xine_health_check_t*, int check_num) XINE #define XINE_CONFIG_TYPE_NUM 4 #define XINE_CONFIG_TYPE_BOOL 5 -/* For the string type (1.1.4 and later). These are stored in num_value. */ +/* For the string type (1.1.4 and later). These are stored in num_value. */ #define XINE_CONFIG_STRING_IS_STRING 0 #define XINE_CONFIG_STRING_IS_FILENAME 1 #define XINE_CONFIG_STRING_IS_DEVICE_NAME 2 @@ -1836,8 +1850,8 @@ typedef struct { * mrl reference data is sent by demuxers when a reference stream is found. * this stream just contains pointers (urls) to the real data, which are * passed to frontend using this event type. (examples: .asx, .mov and .ram) - * - * ideally, frontends should add these mrls to a "hierarchical playlist". + * + * ideally, frontends should add these mrls to a "hierarchical playlist". * that is, instead of the original file, the ones provided here should be * played instead. on pratice, just using a simple playlist should work. * @@ -1853,7 +1867,7 @@ typedef struct { * 2) http://another/another.avi * * 1 and 2 are the original items on this playlist. 1a and 1b were received - * by events (they are the mrl references enclosed in 1). 1a is played after + * by events (they are the mrl references enclosed in 1). 1a is played after * receiving the finished event from 1. note: 1b is usually ignored, it should * only be used in case 1a fails to open. * @@ -1873,12 +1887,12 @@ typedef struct { /*const char title[]; ** immediately follows MRL's terminating NUL */ } xine_mrl_reference_data_ext_t; -/* +/* * configuration options for video4linux-like input plugins */ typedef struct { /* input selection */ - int input; /* select active input from card */ + int input; /* select active input from card */ int channel; /* channel number */ int radio; /* ask for a radio channel */ uint32_t frequency; /* frequency divided by 62.5KHz or 62.5 Hz */ @@ -1895,13 +1909,13 @@ typedef struct { int frame_height; /* scaled frame height */ /* let some spare space so we can add new fields without breaking - * binary api compatibility. + * binary api compatibility. */ uint32_t spare[20]; /* used by pvr plugin */ int32_t session_id; /* -1 stops pvr recording */ - + } xine_set_v4l2_data_t; /* @@ -1918,7 +1932,7 @@ typedef struct { int gop_closure; /* open/closed GOP */ int b_frames; /* number of B frames to use */ int aspect_ratio; /* XINE_VO_ASPECT_xxx */ - + /* let some spare space so we can add new fields without breaking * binary api compatibility. */ @@ -1933,7 +1947,7 @@ typedef struct { #ifdef XINE_ENABLE_EXPERIMENTAL_FEATURES -/* +/* * ask pvr to save (ie. do not discard) the current session * see comments on input_pvr.c to understand how it works. */ @@ -1944,7 +1958,7 @@ typedef struct { * 1 = save from last sync point * 2 = save everything on current session */ - int mode; + int mode; int id; char name[256]; /* name for saving, might be longer */ } xine_pvr_save_data_t; @@ -1954,7 +1968,7 @@ typedef struct { * 0 = non realtime * 1 = realtime */ - int mode; + int mode; } xine_pvr_realtime_t; typedef struct { @@ -1985,7 +1999,7 @@ typedef struct { * Defined message types for XINE_EVENT_UI_MESSAGE * This is the mechanism to report async errors from engine. * - * If frontend knows about the XINE_MSG_xxx type it may safely + * If frontend knows about the XINE_MSG_xxx type it may safely * ignore the 'explanation' field and provide its own custom * dialogue to the 'parameters'. * @@ -2112,7 +2126,7 @@ void xine_osd_get_text_size (xine_osd_t *self, const char *text, as 'fontname' here */ int xine_osd_set_font (xine_osd_t *self, const char *fontname, int size) XINE_PROTECTED; -/* +/* * specifying encoding of texts * "" ... means current locale encoding (default) * NULL ... means latin1 diff --git a/include/xine/alphablend.h b/include/xine/alphablend.h index f20d2e33e..6df5ad809 100644 --- a/include/xine/alphablend.h +++ b/include/xine/alphablend.h @@ -88,7 +88,7 @@ void _x_blend_yuy2 (uint8_t * dst_img, vo_overlay_t * img_overl, */ void _x_blend_xx44 (uint8_t *dst_img, vo_overlay_t *img_overl, - int dst_width, int dst_height, int dst_pitch, + int dst_width, int dst_height, int dst_pitch, alphablend_t *extra_data, xx44_palette_t *palette,int ia44) XINE_PROTECTED; diff --git a/include/xine/array.h b/include/xine/array.h index 44f3c7632..cd0780e04 100644 --- a/include/xine/array.h +++ b/include/xine/array.h @@ -1,18 +1,18 @@ -/* +/* * Copyright (C) 2000-2006 the xine project - * + * * This file is part of xine, a free 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA diff --git a/include/xine/attributes.h b/include/xine/attributes.h index d7a0e2f1e..2326dab18 100644 --- a/include/xine/attributes.h +++ b/include/xine/attributes.h @@ -47,7 +47,7 @@ # define SUPPORT_ATTRIBUTE_UNUSED 1 # define SUPPORT_ATTRIBUTE_CONST 1 # endif - + # if __GNUC__ >= 4 # define SUPPORT_ATTRIBUTE_VISIBILITY_DEFAULT 1 # if __ELF__ diff --git a/include/xine/audio_decoder.h b/include/xine/audio_decoder.h index 05d29823d..a37967ea6 100644 --- a/include/xine/audio_decoder.h +++ b/include/xine/audio_decoder.h @@ -1,18 +1,18 @@ /* * Copyright (C) 2000-2004 the xine project - * + * * This file is part of xine, a free 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA @@ -45,7 +45,7 @@ struct audio_decoder_class_s { * open a new instance of this plugin class */ audio_decoder_t* (*open_plugin) (audio_decoder_class_t *this, xine_stream_t *stream); - + /** * @brief short human readable identifier for this plugin class */ @@ -62,7 +62,7 @@ struct audio_decoder_class_s { * @brief Optional non-standard catalog to use with dgettext() for description. */ const char *text_domain; - + /* * free all class-related resources */ @@ -75,8 +75,8 @@ struct audio_decoder_class_s { struct audio_decoder_s { /* - * decode data from buf and feed decoded samples to - * audio output + * decode data from buf and feed decoded samples to + * audio output */ void (*decode_data) (audio_decoder_t *this, buf_element_t *buf); @@ -85,13 +85,13 @@ struct audio_decoder_s { * audio data not related to recently decoded data) */ void (*reset) (audio_decoder_t *this); - + /* * inform decoder that a time reference discontinuity has happened. * that is, it must forget any currently held pts value */ - void (*discontinuity) (audio_decoder_t *this); - + void (*discontinuity) (audio_decoder_t *this); + /* * close down, free all resources */ diff --git a/include/xine/audio_out.h b/include/xine/audio_out.h index 8b8316882..daeeb75ea 100644 --- a/include/xine/audio_out.h +++ b/include/xine/audio_out.h @@ -1,18 +1,18 @@ /* * Copyright (C) 2000-2004 the xine project - * + * * This file is part of xine, a free 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA @@ -44,9 +44,9 @@ typedef struct ao_driver_s ao_driver_t; struct ao_driver_s { - /* + /* * - * find out what output modes + capatilities are supported by + * find out what output modes + capatilities are supported by * this plugin (constants for the bit vector to return see above) * * See AO_CAP_* bellow. @@ -54,7 +54,7 @@ struct ao_driver_s { uint32_t (*get_capabilities) (ao_driver_t *); /* - * open the driver and make it ready to receive audio data + * open the driver and make it ready to receive audio data * buffers may be flushed(!) * * return value: 0 : failure, >0 : output sample rate @@ -70,21 +70,21 @@ struct ao_driver_s { */ int (*bytes_per_frame)(ao_driver_t *self_gen); - /* return the delay is frames measured by + /* return the delay is frames measured by * looking at pending samples in the audio output device */ int (*delay)(ao_driver_t *self_gen); - /* + /* * return gap tolerance (in pts) needed for this driver */ int (*get_gap_tolerance) (ao_driver_t *self_gen); /* * write audio data to audio output device - * return value: + * return value: * >0 => audio samples were processed ok - * 0 => audio samples were not yet processed, + * 0 => audio samples were not yet processed, * call write_audio_data with the _same_ samples again */ int (*write)(ao_driver_t *, @@ -158,9 +158,9 @@ struct audio_buffer_s { int64_t vpts; uint32_t frame_header_count; uint32_t first_access_unit; - + /* extra info coming from input or demuxers */ - extra_info_t *extra_info; + extra_info_t *extra_info; xine_stream_t *stream; /* stream that send that buffer */ @@ -185,7 +185,7 @@ struct xine_audio_port_s { int (*get_property) (xine_audio_port_t *, int property); int (*set_property) (xine_audio_port_t *, int property, int value); - /* open audio driver for audio output + /* open audio driver for audio output * return value: 0:failure, >0:output sample rate */ /* when you are not a full-blown stream, but still need to open the port @@ -194,7 +194,7 @@ struct xine_audio_port_s { uint32_t bits, uint32_t rate, int mode); /* - * get a piece of memory for audio data + * get a piece of memory for audio data */ audio_buffer_t * (*get_buffer) (xine_audio_port_t *); @@ -224,7 +224,7 @@ struct xine_audio_port_s { * Flush audio_out fifo. */ void (*flush) (xine_audio_port_t *); - + /* * Check if port is opened for this stream and get parameters. * The stream can be anonymous. @@ -242,7 +242,7 @@ struct audio_driver_class_s { * open a new instance of this plugin class */ ao_driver_t* (*open_plugin) (audio_driver_class_t *, const void *data); - + /** * @brief short human readable identifier for this plugin class */ @@ -259,7 +259,7 @@ struct audio_driver_class_s { * @brief Optional non-standard catalog to use with dgettext() for description. */ const char *text_domain; - + /* * free all class-related resources */ @@ -346,7 +346,7 @@ int _x_ao_channels2mode( int channels ) XINE_PROTECTED; /* audio device control ops */ #define AO_CTRL_PLAY_PAUSE 0 #define AO_CTRL_PLAY_RESUME 1 -#define AO_CTRL_FLUSH_BUFFERS 2 +#define AO_CTRL_FLUSH_BUFFERS 2 /* above that value audio frames are discarded */ #define AO_MAX_GAP 15000 diff --git a/include/xine/broadcaster.h b/include/xine/broadcaster.h index b59d33349..0cd416cac 100644 --- a/include/xine/broadcaster.h +++ b/include/xine/broadcaster.h @@ -7,7 +7,7 @@ * 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 diff --git a/include/xine/buffer.h b/include/xine/buffer.h index 2a396fa3d..daf6c5ee9 100644 --- a/include/xine/buffer.h +++ b/include/xine/buffer.h @@ -1,8 +1,8 @@ /* * Copyright (C) 2000-2008 the xine project - * + * * This file is part of xine, a free 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 @@ -110,7 +110,7 @@ extern "C" { #define BUF_VIDEO_WMV8 0x02140000 #define BUF_VIDEO_MSVC 0x02150000 #define BUF_VIDEO_DV 0x02160000 -#define BUF_VIDEO_REAL 0x02170000 +#define BUF_VIDEO_REAL 0x02170000 #define BUF_VIDEO_VP31 0x02180000 #define BUF_VIDEO_H263 0x02190000 #define BUF_VIDEO_3IVX 0x021A0000 @@ -215,7 +215,7 @@ extern "C" { #define BUF_AUDIO_VOXWARE 0x030c0000 #define BUF_AUDIO_ACELPNET 0x030d0000 #define BUF_AUDIO_AAC 0x030e0000 -#define BUF_AUDIO_DNET 0x030f0000 +#define BUF_AUDIO_DNET 0x030f0000 #define BUF_AUDIO_VIVOG723 0x03100000 #define BUF_AUDIO_DK3ADPCM 0x03110000 #define BUF_AUDIO_DK4ADPCM 0x03120000 @@ -233,10 +233,10 @@ extern "C" { #define BUF_AUDIO_GSM610 0x031E0000 #define BUF_AUDIO_EA_ADPCM 0x031F0000 #define BUF_AUDIO_WMAV2 0x03200000 -#define BUF_AUDIO_COOK 0x03210000 -#define BUF_AUDIO_ATRK 0x03220000 -#define BUF_AUDIO_14_4 0x03230000 -#define BUF_AUDIO_28_8 0x03240000 +#define BUF_AUDIO_COOK 0x03210000 +#define BUF_AUDIO_ATRK 0x03220000 +#define BUF_AUDIO_14_4 0x03230000 +#define BUF_AUDIO_28_8 0x03240000 #define BUF_AUDIO_SIPRO 0x03250000 #define BUF_AUDIO_WMAV3 0x03260000 #define BUF_AUDIO_INTERPLAY 0x03270000 @@ -297,11 +297,11 @@ typedef struct extra_info_s extra_info_t; /** * @brief Structure to pass information from input or demuxer plugins * to output frames (past decoder). - * + * * New data must be added after the existing fields to not break ABI * (backward compatibility). */ - + struct extra_info_s { int input_normpos; /**< remember where this buf came from in @@ -310,10 +310,10 @@ struct extra_info_s { int input_time; /**< time offset in miliseconds from * beginning of stream */ uint32_t frame_number; /**< number of current frame if known */ - + int seek_count; /**< internal engine use */ - int64_t vpts; /**< set on output layers only */ - + int64_t vpts; /**< set on output layers only */ + int invalid; /**< do not use this extra info to update anything */ int total_time; /**< duration in miliseconds of the stream */ }; @@ -338,7 +338,7 @@ struct buf_element_s { uint32_t decoder_flags; /**< stuff like keyframe, is_header ... see below */ /** additional decoder flags and other dec-spec. stuff */ - uint32_t decoder_info[BUF_NUM_DEC_INFO]; + uint32_t decoder_info[BUF_NUM_DEC_INFO]; /** pointers to dec-spec. stuff */ void *decoder_info_ptr[BUF_NUM_DEC_INFO]; @@ -386,7 +386,7 @@ struct buf_element_s { * xine_waveformatex is actually optional since the most important * information for audio init is available from decoder_info[]. * note: BUF_FLAG_HEADER must also be set. */ -#define BUF_FLAG_STDHEADER 0x0400 +#define BUF_FLAG_STDHEADER 0x0400 /** decoder_info[1] carries numerator for display aspect ratio * decoder_info[2] carries denominator for display aspect ratio */ @@ -473,7 +473,7 @@ struct buf_element_s { * four length bytes at the beginning * decoder_info_ptr[2] = pointer to ImageDescription atom, starting with * the codec fourcc - * Some Quicktime decoders need information contained within the + * Some Quicktime decoders need information contained within the * ImageDescription atom inside a Quicktime file's stsd atom. This * special buffer carries the ImageDescription atom from the QT demuxer * to an A/V decoder. @@ -506,7 +506,7 @@ struct buf_element_s { * In a BUF_SPECIAL_SPU_DVD_SUBTYPE: * decoder_info[1] = BUF_SPECIAL_SPU_DVD_SUBTYPE * decoder_info[2] = subtype - * decoder_info[3] = + * decoder_info[3] = * This buffer is pass SPU subtypes from DVDs */ #define BUF_SPECIAL_SPU_DVD_SUBTYPE 8 @@ -548,7 +548,7 @@ struct spu_dvb_descriptor_s long comp_page_id; long aux_page_id; } ; - + typedef struct palette_entry_s palette_entry_t; struct palette_entry_s { diff --git a/include/xine/compat.h b/include/xine/compat.h index d4b95aeb3..0392b45fd 100644 --- a/include/xine/compat.h +++ b/include/xine/compat.h @@ -1,18 +1,18 @@ -/* +/* * Copyright (C) 2000-2001 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA diff --git a/include/xine/configfile.h b/include/xine/configfile.h index f2deb1aa6..a0b9ad1fe 100644 --- a/include/xine/configfile.h +++ b/include/xine/configfile.h @@ -34,11 +34,11 @@ extern "C" { #define CONFIG_FILE_VERSION 2 /** - * config entries above this experience + * config entries above this experience * level must never be changed from MRL */ #define XINE_CONFIG_SECURITY 30 - + typedef struct cfg_entry_s cfg_entry_t; typedef struct config_values_s config_values_t; @@ -179,7 +179,7 @@ struct config_values_s { void (*dispose) (config_values_t *self); /** - * callback called when a new config entry is registered + * callback called when a new config entry is registered */ void (*set_new_entry_callback) (config_values_t *self, xine_config_cb_t new_entry_cb, void *cb_data); @@ -216,7 +216,7 @@ struct config_values_s { * mutex for modification to the config */ pthread_mutex_t config_lock; - + /** * current config file's version number */ diff --git a/include/xine/demux.h b/include/xine/demux.h index 72808f76d..2803c30ed 100644 --- a/include/xine/demux.h +++ b/include/xine/demux.h @@ -1,18 +1,18 @@ -/* +/* * Copyright (C) 2000-2003 the xine project - * + * * This file is part of xine, a free 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA @@ -62,12 +62,12 @@ struct demux_class_s { * The description is passed to gettext() to internationalise. */ const char *description; - + /** * @brief Optional non-standard catalog to use with dgettext() for description. */ const char *text_domain; - + /** * @brief MIME types supported for this plugin */ @@ -104,7 +104,7 @@ struct demux_plugin_s { void (*send_headers) (demux_plugin_t *this); /* - * ask demux to seek + * ask demux to seek * * for seekable streams, a start position can be specified * @@ -122,11 +122,11 @@ struct demux_plugin_s { * starting the demuxer) */ - int (*seek) (demux_plugin_t *this, + int (*seek) (demux_plugin_t *this, off_t start_pos, int start_time, int playing ); /* - * send a chunk of data down to decoder fifos + * send a chunk of data down to decoder fifos * * the meaning of "chunk" is specific to every demux, usually * it involves parsing one unit of data from stream. @@ -136,15 +136,15 @@ struct demux_plugin_s { */ int (*send_chunk) (demux_plugin_t *this); - + /* - * free resources + * free resources */ void (*dispose) (demux_plugin_t *this) ; /* - * returns DEMUX_OK or DEMUX_FINISHED + * returns DEMUX_OK or DEMUX_FINISHED */ int (*get_status) (demux_plugin_t *this) ; @@ -161,12 +161,12 @@ struct demux_plugin_s { */ uint32_t (*get_capabilities) (demux_plugin_t *this); - + /* * request optional data from input plugin. */ int (*get_optional_data) (demux_plugin_t *this, void *data, int data_type); - + /* * "backwards" link to plugin class */ @@ -196,8 +196,8 @@ struct demux_plugin_s { /* * DEMUX_CAP_AUDIOLANG: * DEMUX_CAP_SPULANG: - * demux plugin knows something about audio/spu languages, - * e.g. knows that audio stream #0 is english, + * demux plugin knows something about audio/spu languages, + * e.g. knows that audio stream #0 is english, * audio stream #1 is german, ... Same bits as INPUT * capabilities . */ diff --git a/include/xine/info_helper.h b/include/xine/info_helper.h index d4123ba2b..666b94f08 100644 --- a/include/xine/info_helper.h +++ b/include/xine/info_helper.h @@ -20,7 +20,7 @@ * stream metainfo helper functions * hide some xine engine details from demuxers and reduce code duplication * - * $id$ + * $id$ */ #ifndef INFO_HELPER_H diff --git a/include/xine/input_plugin.h b/include/xine/input_plugin.h index 2a75d7f9b..1d2e0bb43 100644 --- a/include/xine/input_plugin.h +++ b/include/xine/input_plugin.h @@ -1,18 +1,18 @@ /* * Copyright (C) 2000-2004 the xine project - * + * * This file is part of xine, a free 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA @@ -33,7 +33,7 @@ #endif #define INPUT_PLUGIN_IFACE_VERSION 18 - + typedef struct input_class_s input_class_t ; typedef struct input_plugin_s input_plugin_t; @@ -61,7 +61,7 @@ struct input_class_s { * @brief Optional non-standard catalog to use with dgettext() for description. */ const char *text_domain; - + /* * ls function, optional: may be NULL * return value: NULL => filename is a file, **char=> filename is a dir @@ -101,7 +101,7 @@ struct input_plugin_s { * return capabilities of the current playable entity. See * get_current_pos below for a description of a "playable entity" * Capabilities a created by "OR"ing a mask of constants listed - * below which start "INPUT_CAP". + * below which start "INPUT_CAP". * * depending on the values set, some of the functions below * will or will not get called or should (not) be able to @@ -132,7 +132,7 @@ struct input_plugin_s { /* - * seek position, return new position + * seek position, return new position * * if seeking failed, -1 is returned */ @@ -140,7 +140,7 @@ struct input_plugin_s { /* - * seek to time position, return new position + * seek to time position, return new position * time_offset is given in miliseconds * * if seeking failed, -1 is returned @@ -157,7 +157,7 @@ struct input_plugin_s { */ off_t (*get_current_pos) (input_plugin_t *this); - + /* * get current time position in stream in miliseconds. * @@ -169,7 +169,7 @@ struct input_plugin_s { /* * return number of bytes in the next playable entity or -1 if the * input is unlimited, as would be the case in a network stream. - * + * * A "playable entity" tends to be the entities listed in a playback * list or the units on which playback control generally works on. * It might be the number of bytes in a VCD "segment" or "track" (if @@ -190,7 +190,7 @@ struct input_plugin_s { * return block size in bytes of next complete playable entity (if * supported, 0 otherwise). See the description above under * get_length for a description of a "complete playable entity". - * + * * this block size is only used for mpeg streams stored on * a block oriented storage media, e.g. DVDs and VCDs, to speed * up the demuxing process. only set this (and the INPUT_CAP_BLOCK @@ -245,11 +245,11 @@ struct input_plugin_s { #define INPUT_CAP_NOCAP 0x00000000 /* - * INPUT_CAP_SEEKABLE: - * seek () works reliably. + * INPUT_CAP_SEEKABLE: + * seek () works reliably. * even for plugins that do not have this flag set - * it is a good idea to implement the seek() function - * in a "best effort" style anyway, so at least + * it is a good idea to implement the seek() function + * in a "best effort" style anyway, so at least * throw away data for network streams when seeking forward */ @@ -257,9 +257,9 @@ struct input_plugin_s { /* * INPUT_CAP_BLOCK: - * means more or less that a block device sits behind - * this input plugin. get_blocksize must be implemented. - * will be used for fast and efficient demuxing of + * means more or less that a block device sits behind + * this input plugin. get_blocksize must be implemented. + * will be used for fast and efficient demuxing of * mpeg streams (demux_mpeg_block). */ @@ -268,8 +268,8 @@ struct input_plugin_s { /* * INPUT_CAP_AUDIOLANG: * INPUT_CAP_SPULANG: - * input plugin knows something about audio/spu languages, - * e.g. knows that audio stream #0 is english, + * input plugin knows something about audio/spu languages, + * e.g. knows that audio stream #0 is english, * audio stream #1 is german, ... * *((int *)data) will provide the requested channel number * and awaits the language back in (char *)data @@ -277,20 +277,20 @@ struct input_plugin_s { #define INPUT_CAP_AUDIOLANG 0x00000008 #define INPUT_CAP_SPULANG 0x00000010 - -/* + +/* * INPUT_CAP_PREVIEW: - * get_optional_data can handle INPUT_OPTIONAL_DATA_PREVIEW - * so a non-seekable stream plugin can povide the first - * few bytes for demuxers to look at them and decide wheter - * they can handle the stream or not. the preview data must - * be buffered and delivered again through subsequent + * get_optional_data can handle INPUT_OPTIONAL_DATA_PREVIEW + * so a non-seekable stream plugin can povide the first + * few bytes for demuxers to look at them and decide wheter + * they can handle the stream or not. the preview data must + * be buffered and delivered again through subsequent * read() calls. - * caller must provide a buffer allocated with at least + * caller must provide a buffer allocated with at least * MAX_PREVIEW_SIZE bytes. */ -#define INPUT_CAP_PREVIEW 0x00000040 +#define INPUT_CAP_PREVIEW 0x00000040 /* * INPUT_CAP_CHAPTERS: @@ -373,13 +373,13 @@ struct input_plugin_s { #define MRL_DUPLICATE(s, d) { \ _x_assert((s) != NULL); \ _x_assert((d) != NULL); \ - \ + \ free((d)->origin); \ (d)->origin = (s)->origin ? strdup((s)->origin) : NULL; \ - \ + \ free((d)->mrl); \ (d)->mrl = (s)->mrl ? strdup((s)->mrl) : NULL; \ - \ + \ free((d)->link); \ (d)->link = (s)->link ? strdup((s)->link) : NULL; \ \ diff --git a/include/xine/list.h b/include/xine/list.h index f05ed2b0e..4910f9982 100644 --- a/include/xine/list.h +++ b/include/xine/list.h @@ -1,18 +1,18 @@ -/* +/* * Copyright (C) 2000-2006 the xine project - * + * * This file is part of xine, a free 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA diff --git a/include/xine/metronom.h b/include/xine/metronom.h index 28ca7d62d..4f4bb04eb 100644 --- a/include/xine/metronom.h +++ b/include/xine/metronom.h @@ -1,30 +1,30 @@ -/* +/* * Copyright (C) 2000-2004 the xine project - * + * * This file is part of xine, a free 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * metronom: general pts => virtual calculation/assoc - * + * * virtual pts: unit 1/90000 sec, always increasing * can be used for synchronization * video/audio frame with same pts also have same vpts * but pts is likely to differ from vpts * - * the basic idea is: + * the basic idea is: * video_pts + video_wrap_offset = video_vpts * audio_pts + audio_wrap_offset = audio_vpts * @@ -62,8 +62,8 @@ typedef struct scr_plugin_s scr_plugin_t; #define PREBUFFER_PTS_OFFSET 12000 /* see below */ -#define DISC_STREAMSTART 0 -#define DISC_RELATIVE 1 +#define DISC_STREAMSTART 0 +#define DISC_RELATIVE 1 #define DISC_ABSOLUTE 2 #define DISC_STREAMSEEK 3 @@ -86,9 +86,9 @@ struct metronom_s { * * this function will also update video_wrap_offset if a discontinuity * is detected (read the comentaries below about discontinuities). - * + * */ - + void (*got_video_frame) (metronom_t *self, vo_frame_t *frame); /* @@ -104,8 +104,8 @@ struct metronom_s { * */ - int64_t (*got_audio_samples) (metronom_t *self, int64_t pts, - int nsamples); + int64_t (*got_audio_samples) (metronom_t *self, int64_t pts, + int nsamples); /* * called by SPU decoder whenever a packet is delivered to it @@ -129,7 +129,7 @@ struct metronom_s { * * DISC_STREAMSTART : new stream starts, expect pts values to start * from zero immediately - * DISC_RELATIVE : typically a wrap-around, expect pts with + * DISC_RELATIVE : typically a wrap-around, expect pts with * a specified offset from the former ones soon * DISC_ABSOLUTE : typically a new menu stream (nav packets) * pts will start from given value soon @@ -147,7 +147,7 @@ struct metronom_s { */ void (*set_option) (metronom_t *self, int option, int64_t value); int64_t (*get_option) (metronom_t *self, int option); - + /* * set a master metronom * this is currently useful to sync independently generated streams @@ -155,7 +155,7 @@ struct metronom_s { * metronom */ void (*set_master) (metronom_t *self, metronom_t *master); - + void (*exit) (metronom_t *self); #ifdef METRONOM_INTERNAL @@ -163,7 +163,7 @@ struct metronom_s { * metronom internal stuff */ xine_t *xine; - + metronom_t *master; int64_t pts_per_smpls; @@ -177,7 +177,7 @@ struct metronom_s { int64_t video_drift; int64_t video_drift_step; - + int audio_samples; int64_t audio_drift_step; @@ -288,9 +288,9 @@ struct metronom_clock_s { #ifdef METRONOM_CLOCK_INTERNAL void (*exit) (metronom_clock_t *self); - + xine_t *xine; - + scr_plugin_t *scr_master; scr_plugin_t **scr_list; pthread_t sync_thread; @@ -305,7 +305,7 @@ struct metronom_clock_s { int dummy10; int dummy11; #endif - + int speed; #ifdef METRONOM_CLOCK_INTERNAL @@ -330,8 +330,8 @@ struct scr_plugin_s { int (*get_priority) (scr_plugin_t *self); - /* - * set/get clock speed + /* + * set/get clock speed * * for speed constants see xine_internal.h * returns actual speed diff --git a/include/xine/os_types.h b/include/xine/os_types.h index 75ce9b8a5..aa6eddb00 100644 --- a/include/xine/os_types.h +++ b/include/xine/os_types.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * - * Platform dependent types needed by public xine.h. + * Platform dependent types needed by public xine.h. * Types not needed by xine.h are specified in os_internal.h. * * Heavily based on os_types.h from OggVorbis (BSD License), @@ -97,7 +97,7 @@ #else - /* + /* * CygWin: _WIN32 & __GNUC__ * BeOS: __BEOS__ * Linux, Solaris, Mac and others diff --git a/include/xine/osd.h b/include/xine/osd.h index ef0994e8a..00df97ad2 100644 --- a/include/xine/osd.h +++ b/include/xine/osd.h @@ -1,18 +1,18 @@ /* * Copyright (C) 2000-2003 the xine project - * + * * This file is part of xine, a free 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA @@ -49,11 +49,11 @@ struct osd_object_s { /* extent of reference coordinate system */ int extent_width, extent_height; - + /* clipping box inside work area */ int x1, y1; int x2, y2; - + uint32_t color[OVL_PALETTE_SIZE]; /* color lookup table */ uint8_t trans[OVL_PALETTE_SIZE]; /* mixer key table */ @@ -61,7 +61,7 @@ struct osd_object_s { iconv_t cd; /* iconv handle of encoding */ char *encoding; /* name of encoding */ #endif - + osd_font_t *font; osd_ft2context_t *ft2; @@ -80,7 +80,7 @@ struct xine_osd_s { }; struct osd_renderer_s { - + xine_stream_t *stream; /* @@ -111,17 +111,17 @@ struct osd_renderer_s { */ int (*hide) (osd_object_t *osd, int64_t vpts ); - /* + /* * draw point. */ void (*point) (osd_object_t *osd, int x, int y, int color); - + /* * Bresenham line implementation on osd object */ void (*line) (osd_object_t *osd, int x1, int y1, int x2, int y2, int color ); - + /* * filled rectangle */ @@ -134,7 +134,7 @@ struct osd_renderer_s { void (*set_palette) (osd_object_t *osd, const uint32_t *color, const uint8_t *trans ); /* - * set on existing text palette + * set on existing text palette * (-1 to set used specified palette) * * color_base specifies the first color index to use for this text @@ -145,11 +145,11 @@ struct osd_renderer_s { */ void (*set_text_palette) (osd_object_t *osd, int palette_number, int color_base ); - + /* * get palette (color and transparency) */ - void (*get_palette) (osd_object_t *osd, uint32_t *color, + void (*get_palette) (osd_object_t *osd, uint32_t *color, uint8_t *trans); /* @@ -176,20 +176,20 @@ struct osd_renderer_s { * no \n yet * * The text is assigned the colors starting at the index specified by - * color_base up to the size of the text palette. + * color_base up to the size of the text palette. * * Use OSD_TEXT1, OSD_TEXT2, ... for some preasssigned color indices. */ - int (*render_text) (osd_object_t *osd, int x1, int y1, + int (*render_text) (osd_object_t *osd, int x1, int y1, const char *text, int color_base); /* * get width and height of how text will be renderized */ - int (*get_text_size) (osd_object_t *osd, const char *text, + int (*get_text_size) (osd_object_t *osd, const char *text, int *width, int *height); - /* + /* * close osd rendering engine * loaded fonts are unloaded * osd objects are closed @@ -200,7 +200,7 @@ struct osd_renderer_s { * clear an osd object (empty drawing area) */ void (*clear) (osd_object_t *osd ); - + /* * paste a bitmap with optional palette mapping */ @@ -266,7 +266,7 @@ osd_renderer_t *_x_osd_renderer_init( xine_stream_t *stream ) XINE_MALLOC; /* - * The size of a text palette + * The size of a text palette */ #define TEXT_PALETTE_SIZE 11 @@ -287,16 +287,16 @@ osd_renderer_t *_x_osd_renderer_init( xine_stream_t *stream ) XINE_MALLOC; #define OSD_TEXT9 (8 * TEXT_PALETTE_SIZE) #define OSD_TEXT10 (9 * TEXT_PALETTE_SIZE) -/* +/* * Defined palettes for rendering osd text * (more can be added later) - */ + */ #define NUMBER_OF_TEXT_PALETTES 4 #define TEXTPALETTE_WHITE_BLACK_TRANSPARENT 0 #define TEXTPALETTE_WHITE_NONE_TRANSPARENT 1 #define TEXTPALETTE_WHITE_NONE_TRANSLUCID 2 #define TEXTPALETTE_YELLOW_BLACK_TRANSPARENT 3 - + #endif diff --git a/include/xine/plugin_catalog.h b/include/xine/plugin_catalog.h index bacdfa56c..0f4a464b3 100644 --- a/include/xine/plugin_catalog.h +++ b/include/xine/plugin_catalog.h @@ -1,18 +1,18 @@ /* * Copyright (C) 2000-2003 the xine project - * + * * This file is part of xine, a free 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA @@ -52,16 +52,16 @@ typedef struct { struct plugin_catalog_s { xine_sarray_t *plugin_lists[PLUGIN_TYPE_MAX]; - + xine_sarray_t *cache_list; xine_list_t *file_list; plugin_node_t *audio_decoder_map[DECODER_MAX][PLUGINS_PER_TYPE]; plugin_node_t *video_decoder_map[DECODER_MAX][PLUGINS_PER_TYPE]; plugin_node_t *spu_decoder_map[DECODER_MAX][PLUGINS_PER_TYPE]; - + const char *ids[PLUGIN_MAX]; - + /* memory block for the decoder priority config entry descriptions */ char *prio_desc[DECODER_MAX]; diff --git a/include/xine/pool.h b/include/xine/pool.h index 2667b7fdc..37f60220c 100644 --- a/include/xine/pool.h +++ b/include/xine/pool.h @@ -1,18 +1,18 @@ -/* +/* * Copyright (C) 2000-2006 the xine project - * + * * This file is part of xine, a free 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA diff --git a/include/xine/post.h b/include/xine/post.h index a8f721a9a..c15bab765 100644 --- a/include/xine/post.h +++ b/include/xine/post.h @@ -1,18 +1,18 @@ /* * Copyright (C) 2000-2004 the xine project - * + * * This file is part of xine, a free 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA @@ -49,7 +49,7 @@ struct post_class_s { post_plugin_t* (*open_plugin) (post_class_t *this, int inputs, xine_audio_port_t **audio_target, xine_video_port_t **video_target); - + /** * @brief short human readable identifier for this plugin class */ @@ -66,7 +66,7 @@ struct post_class_s { * @brief Optional non-standard catalog to use with dgettext() for description. */ const char *text_domain; - + /* * free all class-related resources */ @@ -80,22 +80,22 @@ struct post_plugin_s { /* public part of the plugin */ xine_post_t xine_post; - + /* * the connections announced by the plugin * the plugin must fill these with xine_post_{in,out}_t on init */ xine_list_t *input; xine_list_t *output; - + /* * close down, free all resources */ void (*dispose) (post_plugin_t *this); - + /* plugins don't have to init the stuff below */ - - /* + + /* * the running ticket * * the plugin must assure to check for ticket revocation in @@ -106,11 +106,11 @@ struct post_plugin_s { * the running ticket is assigned to you by the engine */ xine_ticket_t *running_ticket; - + /* this is needed by the engine to decrement the reference counter * on disposal of the plugin, but since this is useful, we expose it */ xine_t *xine; - + /* used when the user requests a list of all inputs/outputs */ const char **input_ids; const char **output_ids; @@ -138,10 +138,10 @@ struct post_in_s { /* public part of the input */ xine_post_in_t xine_in; - + /* backward reference so that you have access to the post plugin */ post_plugin_t *post; - + /* you can fill this to your liking */ void *user_data; }; @@ -150,10 +150,10 @@ struct post_out_s { /* public part of the output */ xine_post_out_t xine_out; - + /* backward reference so that you have access to the post plugin */ post_plugin_t *post; - + /* you can fill this to your liking */ void *user_data; }; @@ -177,19 +177,19 @@ struct post_video_port_s { /* the new public port with replaced function pointers */ xine_video_port_t new_port; - + /* the original port to call its functions from inside yours */ xine_video_port_t *original_port; - + /* if you want to decide yourself, whether a given frame should * be intercepted, fill in this function; get_frame() acts as * a template method and asks your function; return a boolean; * the default is to intercept all frames */ int (*intercept_frame)(post_video_port_t *self, vo_frame_t *frame); - + /* the new frame function pointers */ vo_frame_t *new_frame; - + /* if you want to decide yourself, whether the preprocessing functions * should still be routed when draw is intercepted, fill in this * function; _x_post_intercept_video_frame() acts as a template method @@ -202,34 +202,34 @@ struct post_video_port_s { * a template method and asks your function; return a boolean; * the default is _not_ to intercept the overlay manager */ int (*intercept_ovl)(post_video_port_t *self); - + /* the new public overlay manager with replaced function pointers */ video_overlay_manager_t *new_manager; - + /* the original manager to call its functions from inside yours */ video_overlay_manager_t *original_manager; - + /* usage counter: how many objects are floating around that need * these pointers to exist */ int usage_count; pthread_mutex_t usage_lock; - + /* the stream we are being fed by; NULL means no stream is connected; * this may be an anonymous stream */ xine_stream_t *stream; - + /* point to a mutex here, if you need some synchronization */ pthread_mutex_t *port_lock; pthread_mutex_t *frame_lock; pthread_mutex_t *manager_lock; - + /* backward reference so that you have access to the post plugin * when the call only gives you the port */ post_plugin_t *post; - + /* you can fill this to your liking */ void *user_data; - + #ifdef POST_INTERNAL /* some of the above members are to be directly included here, but * adding the structures would mean that post_video_port_t becomes @@ -237,13 +237,13 @@ struct post_video_port_s { * above and have them point into the memory provided here; * note that the overlay manager needs to be first so that we can * reconstruct the post_video_port_t* from overlay manager calls */ - + /* any change here requires a change in _x_post_ovl_manager_to_port() * below! */ - + video_overlay_manager_t manager_storage; vo_frame_t frame_storage; - + /* this is used to keep a linked list of free vo_frame_t's */ vo_frame_t *free_frame_slots; pthread_mutex_t free_frames_lock; @@ -303,31 +303,31 @@ struct post_audio_port_s { /* the new public port with replaced function pointers */ xine_audio_port_t new_port; - + /* the original port to call its functions from inside yours */ xine_audio_port_t *original_port; - + /* the stream we are being fed by; NULL means no stream is connected; * this may be an anonymous stream */ xine_stream_t *stream; - + pthread_mutex_t usage_lock; /* usage counter: how many objects are floating around that need * these pointers to exist */ int usage_count; - + /* some values remembered by (port->open) () */ uint32_t bits; uint32_t rate; uint32_t mode; - + /* point to a mutex here, if you need some synchronization */ pthread_mutex_t *port_lock; - + /* backward reference so that you have access to the post plugin * when the call only gives you the port */ post_plugin_t *post; - + /* you can fill this to your liking */ void *user_data; }; @@ -389,7 +389,7 @@ do { \ } while(0) -/* macros to create parameter descriptors */ +/* macros to create parameter descriptors */ #define START_PARAM_DESCR( param_t ) \ static param_t temp_s; \ diff --git a/include/xine/refcounter.h b/include/xine/refcounter.h index 0731cb93a..9e2a58f67 100644 --- a/include/xine/refcounter.h +++ b/include/xine/refcounter.h @@ -1,18 +1,18 @@ /* * Copyright (C) 2000-2004 the xine project - * + * * This file is part of xine, a free 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA diff --git a/include/xine/resample.h b/include/xine/resample.h index 40b4de486..842434cf0 100644 --- a/include/xine/resample.h +++ b/include/xine/resample.h @@ -1,18 +1,18 @@ /* * Copyright (C) 2000-2003 the xine project - * + * * This file is part of xine, a free 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA @@ -28,35 +28,35 @@ #define RESAMPLE_MAX_CHANNELS 6 void _x_audio_out_resample_stereo(int16_t* last_sample, - int16_t* input_samples, uint32_t in_samples, + int16_t* input_samples, uint32_t in_samples, int16_t* output_samples, uint32_t out_samples) XINE_PROTECTED; void _x_audio_out_resample_mono(int16_t* last_sample, - int16_t* input_samples, uint32_t in_samples, + int16_t* input_samples, uint32_t in_samples, int16_t* output_samples, uint32_t out_samples) XINE_PROTECTED; void _x_audio_out_resample_4channel(int16_t* last_sample, - int16_t* input_samples, uint32_t in_samples, + int16_t* input_samples, uint32_t in_samples, int16_t* output_samples, uint32_t out_samples) XINE_PROTECTED; void _x_audio_out_resample_5channel(int16_t* last_sample, - int16_t* input_samples, uint32_t in_samples, + int16_t* input_samples, uint32_t in_samples, int16_t* output_samples, uint32_t out_samples) XINE_PROTECTED; void _x_audio_out_resample_6channel(int16_t* last_sample, - int16_t* input_samples, uint32_t in_samples, + int16_t* input_samples, uint32_t in_samples, int16_t* output_samples, uint32_t out_samples) XINE_PROTECTED; -void _x_audio_out_resample_8to16(int8_t* input_samples, +void _x_audio_out_resample_8to16(int8_t* input_samples, int16_t* output_samples, uint32_t samples) XINE_PROTECTED; -void _x_audio_out_resample_16to8(int16_t* input_samples, +void _x_audio_out_resample_16to8(int16_t* input_samples, int8_t* output_samples, uint32_t samples) XINE_PROTECTED; -void _x_audio_out_resample_monotostereo(int16_t* input_samples, +void _x_audio_out_resample_monotostereo(int16_t* input_samples, int16_t* output_samples, uint32_t frames) XINE_PROTECTED; -void _x_audio_out_resample_stereotomono(int16_t* input_samples, +void _x_audio_out_resample_stereotomono(int16_t* input_samples, int16_t* output_samples, uint32_t frames) XINE_PROTECTED; - + #endif diff --git a/include/xine/ring_buffer.h b/include/xine/ring_buffer.h index 5f104dc77..7678aa903 100644 --- a/include/xine/ring_buffer.h +++ b/include/xine/ring_buffer.h @@ -1,18 +1,18 @@ -/* +/* * Copyright (C) 2000-2006 the xine project - * + * * This file is part of xine, a free 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA diff --git a/include/xine/scratch.h b/include/xine/scratch.h index c45af198f..c0c927b97 100644 --- a/include/xine/scratch.h +++ b/include/xine/scratch.h @@ -1,18 +1,18 @@ /* * Copyright (C) 2000-2006 the xine project - * + * * This file is part of xine, a free 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA diff --git a/include/xine/sorted_array.h b/include/xine/sorted_array.h index c6fdd1c25..0d229199a 100644 --- a/include/xine/sorted_array.h +++ b/include/xine/sorted_array.h @@ -1,25 +1,25 @@ -/* +/* * Copyright (C) 2000-2006 the xine project - * + * * This file is part of xine, a free 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * Sorted array which grows automatically when you add elements. * A binary search is used to find the position of a new element. - * + * * Example: * Let's create de comparison method for integers: * diff --git a/include/xine/spu.h b/include/xine/spu.h index daba7866b..e53462236 100644 --- a/include/xine/spu.h +++ b/include/xine/spu.h @@ -1,18 +1,18 @@ -/* +/* * Copyright (C) 2007 the xine project - * + * * This file is part of xine, a free 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., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. diff --git a/include/xine/spu_decoder.h b/include/xine/spu_decoder.h index 1833a22b4..9ab926bdf 100644 --- a/include/xine/spu_decoder.h +++ b/include/xine/spu_decoder.h @@ -4,7 +4,7 @@ * Copyright (C) James Courtier-Dutton James@superbug.demon.co.uk - July 2001 * * 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 @@ -14,10 +14,10 @@ * 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 GNU Make; see the file COPYING. If not, write to - * the Free Software Foundation, + * the Free Software Foundation, * */ @@ -46,7 +46,7 @@ struct spu_decoder_class_s { * open a new instance of this plugin class */ spu_decoder_t* (*open_plugin) (spu_decoder_class_t *this, xine_stream_t *stream); - + /** * @brief short human readable identifier for this plugin class */ @@ -63,7 +63,7 @@ struct spu_decoder_class_s { * @brief Optional non-standard catalog to use with dgettext() for description. */ const char *text_domain; - + /* * free all class-related resources */ @@ -71,12 +71,12 @@ struct spu_decoder_class_s { }; #define default_spu_decoder_class_dispose (void (*) (spu_decoder_class_t *this))free - + struct spu_decoder_s { /* * decode data from buf and feed the overlay to overlay manager - */ + */ void (*decode_data) (spu_decoder_t *this, buf_element_t *buf); /* @@ -84,7 +84,7 @@ struct spu_decoder_s { * SPU data not related to recently decoded data) */ void (*reset) (spu_decoder_t *this); - + /* * inform decoder that a time reference discontinuity has happened. * that is, it must forget any currently held pts value diff --git a/include/xine/vdr.h b/include/xine/vdr.h index 77a7a41f8..c45cee13d 100644 --- a/include/xine/vdr.h +++ b/include/xine/vdr.h @@ -129,7 +129,7 @@ typedef struct __attribute__((packed)) data_header_s { uint32_t func:8; uint32_t len:24; -} +} data_header_t; @@ -150,7 +150,7 @@ data_nop_t; typedef struct __attribute__((packed)) data_osd_new_s { data_header_t header; - + uint8_t window; int16_t x; int16_t y; @@ -166,7 +166,7 @@ data_osd_new_t; typedef struct __attribute__((packed)) data_osd_free_s { data_header_t header; - + uint8_t window; } data_osd_free_t; @@ -176,7 +176,7 @@ data_osd_free_t; typedef struct __attribute__((packed)) data_osd_show_s { data_header_t header; - + uint8_t window; } data_osd_show_t; @@ -186,7 +186,7 @@ data_osd_show_t; typedef struct __attribute__((packed)) data_osd_hide_s { data_header_t header; - + uint8_t window; } data_osd_hide_t; @@ -212,7 +212,7 @@ data_play_external_t; typedef struct __attribute__((packed)) data_osd_set_position_s { data_header_t header; - + uint8_t window; int16_t x; int16_t y; @@ -224,7 +224,7 @@ data_osd_set_position_t; typedef struct __attribute__((packed)) data_osd_draw_bitmap_s { data_header_t header; - + uint8_t window; int16_t x; int16_t y; @@ -239,7 +239,7 @@ data_osd_draw_bitmap_t; typedef struct __attribute__((packed)) data_set_color_s { data_header_t header; - + uint8_t window; uint8_t index; uint8_t num; @@ -262,7 +262,7 @@ data_flush_t; typedef struct __attribute__((packed)) result_flush_s { result_header_t header; - + uint8_t timed_out; } result_flush_t; @@ -511,7 +511,7 @@ data_reset_audio_t; typedef struct __attribute__((packed)) event_key_s { event_header_t header; - + uint32_t key; } event_key_t; @@ -521,7 +521,7 @@ event_key_t; typedef struct __attribute__((packed)) event_frame_size_s { event_header_t header; - + int32_t left; int32_t top; int32_t width; @@ -536,7 +536,7 @@ event_frame_size_t; typedef struct __attribute__((packed)) event_play_external_s { event_header_t header; - + uint32_t key; } event_play_external_t; @@ -546,7 +546,7 @@ event_play_external_t; typedef struct __attribute__((packed)) data_select_audio_s { data_header_t header; - + uint8_t channels; } data_select_audio_t; @@ -566,7 +566,7 @@ data_trick_speed_mode_t; typedef struct __attribute__((packed)) event_discontinuity_s { event_header_t header; - + int32_t type; } event_discontinuity_t; diff --git a/include/xine/video_decoder.h b/include/xine/video_decoder.h index 022c2af33..faf7eac51 100644 --- a/include/xine/video_decoder.h +++ b/include/xine/video_decoder.h @@ -1,18 +1,18 @@ /* * Copyright (C) 2000-2004 the xine project - * + * * This file is part of xine, a free 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA @@ -63,7 +63,7 @@ struct video_decoder_class_s { * @brief Optional non-standard catalog to use with dgettext() for description. */ const char *text_domain; - + /* * free all class-related resources */ @@ -75,8 +75,8 @@ struct video_decoder_class_s { struct video_decoder_s { /* - * decode data from buf and feed decoded frames to - * video output + * decode data from buf and feed decoded frames to + * video output */ void (*decode_data) (video_decoder_t *this, buf_element_t *buf); @@ -85,13 +85,13 @@ struct video_decoder_s { * video data not related to recently decoded data) */ void (*reset) (video_decoder_t *this); - + /* * inform decoder that a time reference discontinuity has happened. * that is, it must forget any currently held pts value */ void (*discontinuity) (video_decoder_t *this); - + /* * flush out any frames that are still stored in the decoder */ @@ -100,7 +100,7 @@ struct video_decoder_s { /* * close down, free all resources */ - void (*dispose) (video_decoder_t *this); + void (*dispose) (video_decoder_t *this); /** * @brief Pointer to the loaded plugin node. diff --git a/include/xine/video_out.h b/include/xine/video_out.h index 4809ce719..7f88ef504 100644 --- a/include/xine/video_out.h +++ b/include/xine/video_out.h @@ -1,24 +1,24 @@ /* * Copyright (C) 2000-2004 the xine project - * + * * This file is part of xine, a free 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * - * xine version of video_out.h + * xine version of video_out.h * * vo_frame : frame containing yuv data and timing info, * transferred between video_decoder and video_output @@ -45,7 +45,7 @@ extern "C" { # include <xine/plugin_catalog.h> #endif -typedef struct vo_frame_s vo_frame_t; +typedef struct vo_frame_s vo_frame_t; typedef struct vo_driver_s vo_driver_t; typedef struct video_driver_class_s video_driver_class_t; typedef struct vo_overlay_s vo_overlay_t; @@ -86,7 +86,7 @@ struct vo_frame_s { /* tell video driver that the decoder starts a new field */ void (*field) (vo_frame_t *vo_img, int which_field); - /* append this frame to the display queue, + /* append this frame to the display queue, returns number of frames to skip if decoder is late */ /* when the frame does not originate from a stream, it is legal to pass an anonymous stream */ int (*draw) (vo_frame_t *vo_img, xine_stream_t *stream); @@ -114,7 +114,7 @@ struct vo_frame_s { /* yv12 (planar) base[0]: y, base[1]: u, base[2]: v */ /* yuy2 (interleaved) base[0]: yuyv..., base[1]: --, base[2]: -- */ - uint8_t *base[3]; + uint8_t *base[3]; int pitches[3]; /* info that can be used for interlaced output (e.g. tv-out) */ @@ -125,7 +125,7 @@ struct vo_frame_s { */ int progressive_frame; int picture_coding_type; - + /* cropping to be done */ int crop_left, crop_right, crop_top, crop_bottom; @@ -133,8 +133,8 @@ struct vo_frame_s { pthread_mutex_t mutex; /* protect access to lock_count */ /* extra info coming from input or demuxers */ - extra_info_t *extra_info; - + extra_info_t *extra_info; + /* additional information to be able to duplicate frames: */ int width, height; double ratio; /* aspect ratio */ @@ -143,7 +143,7 @@ struct vo_frame_s { int drawn; /* used by decoder, frame has already been drawn */ int flags; /* remember the frame flags */ int proc_called; /* track use of proc_*() methods */ - + /* Used to carry private data for accelerated plugins.*/ void *accel_data; @@ -151,19 +151,19 @@ struct vo_frame_s { xine_video_port_t *port; vo_driver_t *driver; xine_stream_t *stream; - + /* displacement for overlays */ int overlay_offset_x, overlay_offset_y; /* pointer to the next frame in display order, used by some vo deint */ struct vo_frame_s *future_frame; - - /* + + /* * that part is used only by video_out.c for frame management * obs: changing anything here will require recompiling vo drivers */ struct vo_frame_s *next; - + int id; /* debugging - track this frame */ int is_first; }; @@ -183,8 +183,8 @@ struct xine_video_port_s { * (e.g. you are a post plugin) it is legal to pass an anonymous stream */ void (*open) (xine_video_port_t *self, xine_stream_t *stream); - /* - * get_frame - allocate an image buffer from display driver + /* + * get_frame - allocate an image buffer from display driver * * params : width == width of video to display. * height == height of video to display. @@ -192,16 +192,16 @@ struct xine_video_port_s { * format == FOURCC descriptor of image format * flags == field/prediction flags */ - vo_frame_t* (*get_frame) (xine_video_port_t *self, uint32_t width, - uint32_t height, double ratio, + vo_frame_t* (*get_frame) (xine_video_port_t *self, uint32_t width, + uint32_t height, double ratio, int format, int flags); /* retrieves the last displayed frame (useful for taking snapshots) */ vo_frame_t* (*get_last_frame) (xine_video_port_t *self); - + /* overlay stuff */ void (*enable_ovl) (xine_video_port_t *self, int ovl_enable); - + /* get overlay manager */ video_overlay_manager_t* (*get_overlay_manager) (xine_video_port_t *self); @@ -217,11 +217,11 @@ struct xine_video_port_s { */ int (*get_property) (xine_video_port_t *self, int property); int (*set_property) (xine_video_port_t *self, int property, int value); - + /* return true if port is opened for this stream, stream can be anonymous */ - int (*status) (xine_video_port_t *self, xine_stream_t *stream, + int (*status) (xine_video_port_t *self, xine_stream_t *stream, int *width, int *height, int64_t *img_duration); - + /* video driver is no longer used by decoder => close */ /* when you are not a full-blown stream, but still need to close the port * (e.g. you are a post plugin) it is legal to pass an anonymous stream */ @@ -244,9 +244,9 @@ struct xine_video_port_s { #define VO_PROP_BRIGHTNESS 5 #define VO_PROP_COLORKEY 6 #define VO_PROP_AUTOPAINT_COLORKEY 7 -#define VO_PROP_ZOOM_X 8 -#define VO_PROP_PAN_SCAN 9 -#define VO_PROP_TVMODE 10 +#define VO_PROP_ZOOM_X 8 +#define VO_PROP_PAN_SCAN 9 +#define VO_PROP_TVMODE 10 #define VO_PROP_MAX_NUM_FRAMES 11 #define VO_PROP_ZOOM_Y 13 #define VO_PROP_DISCARD_FRAMES 14 /* not used by drivers */ @@ -329,7 +329,7 @@ struct vo_driver_s { */ vo_frame_t* (*alloc_frame) (vo_driver_t *self); - /* + /* * check if the given image fullfills the format specified * (re-)allocate memory if necessary */ @@ -360,7 +360,7 @@ struct vo_driver_s { * these can be used by the gui directly: */ int (*get_property) (vo_driver_t *self, int property); - int (*set_property) (vo_driver_t *self, + int (*set_property) (vo_driver_t *self, int property, int value); void (*get_property_min_max) (vo_driver_t *self, int property, int *min, int *max); @@ -375,7 +375,7 @@ struct vo_driver_s { void *data); /* check if a redraw is needed (due to resize) - * this is only used for still frames, normal video playback + * this is only used for still frames, normal video playback * must call that inside display_frame() function. */ int (*redraw_needed) (vo_driver_t *self); @@ -384,7 +384,7 @@ struct vo_driver_s { * free all resources, close driver */ void (*dispose) (vo_driver_t *self); - + /** * @brief Pointer to the loaded plugin node. * @@ -404,7 +404,7 @@ struct video_driver_class_s { * open a new instance of this plugin class */ vo_driver_t* (*open_plugin) (video_driver_class_t *self, const void *visual); - + /** * @brief short human readable identifier for this plugin class */ @@ -421,7 +421,7 @@ struct video_driver_class_s { * @brief Optional non-standard catalog to use with dgettext() for description. */ const char *text_domain; - + /* * free all class-related resources */ @@ -462,7 +462,7 @@ struct vo_overlay_s { /* extent of reference coordinate system */ int extent_width; int extent_height; - + uint32_t color[OVL_PALETTE_SIZE]; /* color lookup table */ uint8_t trans[OVL_PALETTE_SIZE]; /* mixer key table */ int rgb_clut; /* true if clut was converted to rgb */ @@ -475,7 +475,7 @@ struct vo_overlay_s { uint32_t hili_color[OVL_PALETTE_SIZE]; uint8_t hili_trans[OVL_PALETTE_SIZE]; int hili_rgb_clut; /* true if clut was converted to rgb */ - + int unscaled; /* true if it should be blended unscaled */ argb_layer_t *argb_layer; @@ -490,20 +490,20 @@ struct vo_overlay_s { */ struct video_overlay_manager_s { void (*init) (video_overlay_manager_t *this_gen); - + void (*dispose) (video_overlay_manager_t *this_gen); - + int32_t (*get_handle) (video_overlay_manager_t *this_gen, int object_type ); - + void (*free_handle) (video_overlay_manager_t *this_gen, int32_t handle); - + int32_t (*add_event) (video_overlay_manager_t *this_gen, void *event); - + void (*flush_events) (video_overlay_manager_t *this_gen ); - + int (*redraw_needed) (video_overlay_manager_t *this_gen, int64_t vpts ); - - void (*multiple_overlay_blend) (video_overlay_manager_t *this_gen, int64_t vpts, + + void (*multiple_overlay_blend) (video_overlay_manager_t *this_gen, int64_t vpts, vo_driver_t *output, vo_frame_t *vo_img, int enabled); }; diff --git a/include/xine/video_overlay.h b/include/xine/video_overlay.h index 27cae6440..ba710c9c9 100644 --- a/include/xine/video_overlay.h +++ b/include/xine/video_overlay.h @@ -2,17 +2,17 @@ * Copyright (C) 2000-2003 the xine project * * This file is part of xine, a free 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA diff --git a/include/xine/vo_scale.h b/include/xine/vo_scale.h index 1102c6e21..31976329d 100644 --- a/include/xine/vo_scale.h +++ b/include/xine/vo_scale.h @@ -7,7 +7,7 @@ * 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 @@ -40,22 +40,22 @@ struct vo_scale_s { /* true if driver supports frame zooming */ int support_zoom; - + /* forces direct mapping between frame pixels and screen pixels */ int scaling_disabled; - + /* size / aspect ratio calculations */ - /* + /* * "delivered" size: * frame dimension / aspect as delivered by the decoder * used (among other things) to detect frame size changes * units: frame pixels */ - int delivered_width; - int delivered_height; + int delivered_width; + int delivered_height; double delivered_ratio; - + /* * required cropping: * units: frame pixels @@ -65,7 +65,7 @@ struct vo_scale_s { int crop_top; int crop_bottom; - /* + /* * displayed part of delivered images, * taking zoom into account * units: frame pixels @@ -89,10 +89,10 @@ struct vo_scale_s { int gui_x, gui_y; int gui_width, gui_height; int gui_win_x, gui_win_y; - + /* */ int force_redraw; - + /* * video + display pixel aspect * One pixel of height 1 has this width @@ -112,7 +112,7 @@ struct vo_scale_s { int output_height; int output_xoffset; int output_yoffset; - + /* gui callbacks */ @@ -120,13 +120,13 @@ struct vo_scale_s { void (*frame_output_cb) (void *user_data, int video_width, int video_height, double video_pixel_aspect, - int *dest_x, int *dest_y, + int *dest_x, int *dest_y, int *dest_width, int *dest_height, double *dest_pixel_aspect, int *win_x, int *win_y); - + void (*dest_size_cb) (void *user_data, - int video_width, int video_height, + int video_width, int video_height, double video_pixel_aspect, int *dest_width, int *dest_height, double *dest_pixel_aspect); @@ -140,10 +140,10 @@ struct vo_scale_s { */ double output_horizontal_position; double output_vertical_position; - + }; -typedef struct vo_scale_s vo_scale_t; +typedef struct vo_scale_s vo_scale_t; /* @@ -170,7 +170,7 @@ int _x_vo_scale_redraw_needed (vo_scale_t *self) XINE_PROTECTED; /* * */ - + void _x_vo_scale_translate_gui2video(vo_scale_t *self, int x, int y, int *vid_x, int *vid_y) XINE_PROTECTED; @@ -181,11 +181,11 @@ void _x_vo_scale_translate_gui2video(vo_scale_t *self, extern const char _x_vo_scale_aspect_ratio_name_table[][8] XINE_PROTECTED; -/* +/* * initialize rescaling struct */ - -void _x_vo_scale_init(vo_scale_t *self, int support_zoom, + +void _x_vo_scale_init(vo_scale_t *self, int support_zoom, int scaling_disabled, config_values_t *config ) XINE_PROTECTED; #ifdef __cplusplus diff --git a/include/xine/xine_buffer.h b/include/xine/xine_buffer.h index 73699a2d2..7f6a3921d 100644 --- a/include/xine/xine_buffer.h +++ b/include/xine/xine_buffer.h @@ -1,18 +1,18 @@ -/* +/* * Copyright (C) 2000-2004 the xine project - * + * * This file is part of xine, a free 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA diff --git a/include/xine/xine_internal.h b/include/xine/xine_internal.h index c6e2b50b2..9f2e95aae 100644 --- a/include/xine/xine_internal.h +++ b/include/xine/xine_internal.h @@ -1,18 +1,18 @@ /* * Copyright (C) 2000-2005 the xine project - * + * * This file is part of xine, a free 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA @@ -74,11 +74,11 @@ typedef struct xine_ticket_s xine_ticket_t; */ struct xine_s { - + config_values_t *config; plugin_catalog_t *plugin_catalog; - + int verbosity; int demux_strategy; @@ -89,7 +89,7 @@ struct xine_s { xine_list_t *streams; pthread_mutex_t streams_lock; - + metronom_clock_t *clock; /** Handle for libxdg-basedir functions. It's actually an xdgHandle. */ @@ -115,34 +115,34 @@ struct xine_ticket_s { * the ticket before any operation that might block * * you must never write to this member directly - */ + */ int ticket_revoked; - + /* apply for a ticket; between acquire and relese of an irrevocable * ticket (be sure to pair them properly!), it is guaranteed that you * will never be blocked by ticket revocation */ void (*acquire)(xine_ticket_t *self, int irrevocable); - + /* give a ticket back */ void (*release)(xine_ticket_t *self, int irrevocable); - + /* renew a ticket, when it has been revoked, see ticket_revoked above; * irrevocable must be set to one, if your thread might have acquired * irrevocable tickets you don't know of; set it to zero only when * you know that this is impossible */ void (*renew)(xine_ticket_t *self, int irrevocable); - + #ifdef XINE_ENGINE_INTERNAL /* allow handing out new tickets */ void (*issue)(xine_ticket_t *self, int atomic); - + /* revoke all tickets and deny new ones; * a pair of atomic revoke and issue cannot be interrupted by another * revocation or by other threads acquiring tickets */ void (*revoke)(xine_ticket_t *self, int atomic); - + /* behaves like acquire() but doesn't block the calling thread; when - * the thread would have been blocked, 0 is returned otherwise 1 + * the thread would have been blocked, 0 is returned otherwise 1 * this function acquires a ticket even if ticket revocation is active */ int (*acquire_nonblocking)(xine_ticket_t *self, int irrevocable); @@ -154,7 +154,7 @@ struct xine_ticket_s { void (*unlock_port_rewiring)(xine_ticket_t *self); void (*dispose)(xine_ticket_t *self); - + pthread_mutex_t lock; pthread_mutex_t revoke_lock; pthread_cond_t issued; @@ -194,25 +194,25 @@ struct xine_event_queue_s { */ struct xine_stream_s { - + /* reference to xine context */ xine_t *xine; - /* metronom instance used by current stream */ + /* metronom instance used by current stream */ metronom_t *metronom; - + /* demuxers use input_plugin to read data */ input_plugin_t *input_plugin; - + /* used by video decoders */ xine_video_port_t *video_out; - + /* demuxers send data to video decoders using this fifo */ fifo_buffer_t *video_fifo; - + /* used by audio decoders */ xine_audio_port_t *audio_out; - + /* demuxers send data to audio decoders using this fifo */ fifo_buffer_t *audio_fifo; @@ -225,10 +225,10 @@ struct xine_stream_s { /* input_dvd uses this one. is it possible to add helper functions instead? */ spu_decoder_t *spu_decoder_plugin; - + /* dxr3 use this one, should be possible to fix to use the port instead */ vo_driver_t *video_driver; - + /* these definitely should be made private! */ int audio_channel_auto; int spu_decoder_streamtype; @@ -236,13 +236,13 @@ struct xine_stream_s { int spu_channel_auto; int spu_channel_letterbox; int spu_channel; - + /* current content detection method, see METHOD_BY_xxx */ int content_detection_method; #ifdef XINE_ENGINE_INTERNAL /* these are private variables, plugins must not access them */ - + int status; /* lock controlling speed change access */ @@ -271,7 +271,7 @@ struct xine_stream_s { extra_info_t *video_decoder_extra_info; int video_decoder_streamtype; int video_channel; - + uint32_t audio_track_map[50]; int audio_track_map_entries; @@ -317,15 +317,15 @@ struct xine_stream_s { /* wait for headers sent / stream decoding finished */ pthread_mutex_t counter_lock; pthread_cond_t counter_changed; - int header_count_audio; - int header_count_video; - int finished_count_audio; - int finished_count_video; + int header_count_audio; + int header_count_video; + int finished_count_audio; + int finished_count_video; /* event mechanism */ xine_list_t *event_queues; pthread_mutex_t event_queues_lock; - + /* demux thread stuff */ pthread_t demux_thread; pthread_mutex_t demux_lock; @@ -339,14 +339,14 @@ struct xine_stream_s { int delay_finish_event; /* delay event in 1/10 sec units. 0=>no delay, -1=>forever */ int slave_affection; /* what operations need to be propagated down to the slave? */ - + int err; - + xine_post_out_t video_source; xine_post_out_t audio_source; - + broadcaster_t *broadcaster; - + refcounter_t *refcounter; #endif }; @@ -387,11 +387,11 @@ void _x_extra_info_reset( extra_info_t *extra_info ) XINE_PROTECTED; void _x_extra_info_merge( extra_info_t *dst, extra_info_t *src ) XINE_PROTECTED; void _x_get_current_info (xine_stream_t *stream, extra_info_t *extra_info, int size) XINE_PROTECTED; - - + + /* demuxer helper functions from demux.c */ -/* +/* * Flush audio and video buffers. It is called from demuxers on * seek/stop, and may be useful when user input changes a stream and * xine-lib has cached buffers that have yet to be played. @@ -421,9 +421,9 @@ void _x_demux_send_data(fifo_buffer_t *fifo, uint8_t *data, int size, int input_normpos, int input_time, int total_time, uint32_t frame_number) XINE_PROTECTED; -int _x_demux_read_send_data(fifo_buffer_t *fifo, input_plugin_t *input, - int size, int64_t pts, uint32_t type, - uint32_t decoder_flags, off_t input_normpos, +int _x_demux_read_send_data(fifo_buffer_t *fifo, input_plugin_t *input, + int size, int64_t pts, uint32_t type, + uint32_t decoder_flags, off_t input_normpos, int input_time, int total_time, uint32_t frame_number) XINE_PROTECTED; @@ -436,7 +436,7 @@ void _x_demux_send_mrl_reference (xine_stream_t *stream, int alternative, */ void _x_mrl_unescape(char *mrl) XINE_PROTECTED; -/* +/* * plugin_loader functions * */ diff --git a/include/xine/xine_plugin.h b/include/xine/xine_plugin.h index 2939b17a9..31a14b511 100644 --- a/include/xine/xine_plugin.h +++ b/include/xine/xine_plugin.h @@ -1,18 +1,18 @@ /* * Copyright (C) 2000-2003 the xine project - * + * * This file is part of xine, a free 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA @@ -33,7 +33,7 @@ #define PLUGIN_VIDEO_OUT 7 #define PLUGIN_POST 8 -#define PLUGIN_TYPE_MAX PLUGIN_POST +#define PLUGIN_TYPE_MAX PLUGIN_POST /* this flag may be or'ed with type in order to force preloading the plugin. * very useful to register config items on xine initialization. diff --git a/include/xine/xineintl.h b/include/xine/xineintl.h index 113a033fa..bb9c006ef 100644 --- a/include/xine/xineintl.h +++ b/include/xine/xineintl.h @@ -1,18 +1,18 @@ /* * Copyright (C) 2000-2005 the xine project - * + * * This file is part of xine, a free 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA diff --git a/include/xine/xineutils.h b/include/xine/xineutils.h index 037c05e2d..6c62bb84f 100644 --- a/include/xine/xineutils.h +++ b/include/xine/xineutils.h @@ -47,7 +47,7 @@ extern "C" { #include <stdio.h> #include <string.h> -/* +/* * Mark exported data symbols for link engine library clients with older * Win32 compilers */ diff --git a/include/xine/xmlparser.h b/include/xine/xmlparser.h index 8fed3199c..495e5136b 100644 --- a/include/xine/xmlparser.h +++ b/include/xine/xmlparser.h @@ -88,9 +88,9 @@ int xml_parser_build_tree_with_options_r(xml_parser_t *xml_parser, xml_node_t ** void xml_parser_free_tree(xml_node_t *root_node) XINE_PROTECTED; const char *xml_parser_get_property (const xml_node_t *node, const char *name) XINE_PROTECTED; -int xml_parser_get_property_int (const xml_node_t *node, const char *name, +int xml_parser_get_property_int (const xml_node_t *node, const char *name, int def_value) XINE_PROTECTED; -int xml_parser_get_property_bool (const xml_node_t *node, const char *name, +int xml_parser_get_property_bool (const xml_node_t *node, const char *name, int def_value) XINE_PROTECTED; /* for output: |