diff options
Diffstat (limited to 'src/dxr3')
-rw-r--r-- | src/dxr3/dxr3_decode_spu.c | 4 | ||||
-rw-r--r-- | src/dxr3/dxr3_decode_video.c | 4 | ||||
-rw-r--r-- | src/dxr3/video_out_dxr3.c | 16 |
3 files changed, 12 insertions, 12 deletions
diff --git a/src/dxr3/dxr3_decode_spu.c b/src/dxr3/dxr3_decode_spu.c index 0120fde65..29b5c9463 100644 --- a/src/dxr3/dxr3_decode_spu.c +++ b/src/dxr3/dxr3_decode_spu.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: dxr3_decode_spu.c,v 1.53 2006/05/03 19:46:07 dsalt Exp $ + * $Id: dxr3_decode_spu.c,v 1.54 2006/06/02 22:18:57 dsalt Exp $ */ /* dxr3 spu decoder plugin. @@ -68,7 +68,7 @@ static void *dxr3_spudec_init_plugin(xine_t *xine, void *); /* plugin catalog information */ static uint32_t supported_types[] = { BUF_SPU_DVD, 0 }; -static decoder_info_t dxr3_spudec_info = { +static const decoder_info_t dxr3_spudec_info = { supported_types, /* supported types */ 10 /* priority */ }; diff --git a/src/dxr3/dxr3_decode_video.c b/src/dxr3/dxr3_decode_video.c index 9cd892ab9..58583d1d8 100644 --- a/src/dxr3/dxr3_decode_video.c +++ b/src/dxr3/dxr3_decode_video.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: dxr3_decode_video.c,v 1.61 2006/05/03 19:46:07 dsalt Exp $ + * $Id: dxr3_decode_video.c,v 1.62 2006/06/02 22:18:57 dsalt Exp $ */ /* dxr3 video decoder plugin. @@ -69,7 +69,7 @@ static void *dxr3_init_plugin(xine_t *xine, void *); /* plugin catalog information */ static uint32_t supported_types[] = { BUF_VIDEO_MPEG, 0 }; -static decoder_info_t dxr3_video_decoder_info = { +static const decoder_info_t dxr3_video_decoder_info = { supported_types, /* supported types */ 10 /* priority */ }; diff --git a/src/dxr3/video_out_dxr3.c b/src/dxr3/video_out_dxr3.c index ab5b51366..c5199edf3 100644 --- a/src/dxr3/video_out_dxr3.c +++ b/src/dxr3/video_out_dxr3.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_out_dxr3.c,v 1.112 2006/01/27 07:46:12 tmattern Exp $ + * $Id: video_out_dxr3.c,v 1.113 2006/06/02 22:18:57 dsalt Exp $ */ /* mpeg1 encoding video out plugin for the dxr3. @@ -80,18 +80,18 @@ static dxr3_driver_class_t *dxr3_vo_init_plugin(xine_t *xine, void *visual_gen); /* plugin catalog information */ #ifdef HAVE_X11 -static vo_info_t vo_info_dxr3_x11 = { +static const vo_info_t vo_info_dxr3_x11 = { 10, /* priority */ XINE_VISUAL_TYPE_X11 /* visual type */ }; #endif -static vo_info_t vo_info_dxr3_aa = { +static const vo_info_t vo_info_dxr3_aa = { 10, /* priority */ XINE_VISUAL_TYPE_AA /* visual type */ }; -plugin_info_t xine_plugin_info[] = { +const plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ #ifdef HAVE_X11 { PLUGIN_VIDEO_OUT, 21, "dxr3", XINE_VERSION_CODE, &vo_info_dxr3_x11, &dxr3_x11_init_plugin }, @@ -223,12 +223,12 @@ static vo_driver_t *dxr3_vo_open_plugin(video_driver_class_t *class_gen, const v plugin_node_t *node; #ifdef HAVE_X11 - static char *videoout_modes[] = { "letterboxed tv", "widescreen tv", + static const char const *videoout_modes[] = { "letterboxed tv", "widescreen tv", "letterboxed overlay", "widescreen overlay", NULL }; #else - static char *videoout_modes[] = { "letterboxed tv", "widescreen tv", NULL }; + static const char const *videoout_modes[] = { "letterboxed tv", "widescreen tv", NULL }; #endif - static char *tv_modes[] = { "ntsc", "pal", "pal60" , "default", NULL }; + static const char const *tv_modes[] = { "ntsc", "pal", "pal60" , "default", NULL }; int list_id, list_size; xine_sarray_t *plugin_list; @@ -1247,7 +1247,7 @@ static void dxr3_dispose(vo_driver_t *this_gen) close(this->fd_control); pthread_mutex_lock(&this->spu_device_lock); if (this->fd_spu) { - uint8_t empty_spu[] = { + static const uint8_t empty_spu[] = { 0x00, 0x26, 0x00, 0x08, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x20, 0x01, 0x03, 0x00, 0x00, 0x04, 0x00, 0x00, 0x05, 0x00, 0x00, 0x01, 0x00, |