diff options
| -rw-r--r-- | include/xine.h.in | 62 | ||||
| -rw-r--r-- | m4/attributes.m4 | 2 | ||||
| -rw-r--r-- | src/xine-engine/Makefile.am | 2 | ||||
| -rw-r--r-- | src/xine-engine/tvmode.c | 65 | ||||
| -rw-r--r-- | src/xine-engine/xine_interface.c | 9 |
5 files changed, 2 insertions, 138 deletions
diff --git a/include/xine.h.in b/include/xine.h.in index d342dec0a..5a06eab65 100644 --- a/include/xine.h.in +++ b/include/xine.h.in @@ -87,13 +87,6 @@ typedef struct xine_stream_s xine_stream_t; typedef struct xine_audio_port_s xine_audio_port_t; typedef struct xine_video_port_s xine_video_port_t; -#ifndef XINE_DISABLE_DEPRECATED_FEATURES -/* convenience types: simple player UIs might want to call ports drivers */ -typedef xine_audio_port_t xine_ao_driver_t; -typedef xine_video_port_t xine_vo_driver_t; -#endif - - /********************************************************************* * global engine handling * *********************************************************************/ @@ -1068,12 +1061,6 @@ void xine_plugins_garbage_collector(xine_t *self) XINE_PROTECTED; * visual specific gui <-> xine engine communication * *********************************************************************/ -#ifndef XINE_DISABLE_DEPRECATED_FEATURES -/* talk to video output driver - old method */ -int xine_gui_send_vo_data (xine_stream_t *self, - int type, void *data) XINE_PROTECTED; -#endif - /* new (preferred) method to talk to video driver. */ int xine_port_send_gui_data (xine_video_port_t *vo, int type, void *data) XINE_PROTECTED; @@ -1409,11 +1396,6 @@ struct xine_cfg_entry_s { /* type string */ char *str_value; char *str_default; -#ifndef XINE_DISABLE_DEPRECATED_FEATURES - char *str_sticky; -#else - void *dummy; -#endif /* common to range, enum, num, bool; * num_value is also used by string to indicate what's required: @@ -2087,50 +2069,6 @@ void xine_osd_set_palette (xine_osd_t *self, */ void xine_osd_free (xine_osd_t *self) XINE_PROTECTED; - -#ifndef XINE_DISABLE_DEPRECATED_FEATURES - -/********************************************************************* - * TV-mode API, to make it possible to use nvtvd to view movies * - *********************************************************************/ - -/* These functions are just dummies to maintain API compatibility. - * You should use libnvtvsimple in your frontend instead. */ - -typedef enum { - XINE_TVSYSTEM_PAL = 0, - XINE_TVSYSTEM_NTSC -} xine_tvsystem; - -/* connect to nvtvd server and save current TV and X settings */ -int xine_tvmode_init (xine_t *self) XINE_PROTECTED; - -/* Turn tvmode on/off (1/0)*/ -int xine_tvmode_use(xine_t *self, int use_tvmode) XINE_PROTECTED; - -/* Set which tv system to use: XINE_TVSYSTEM_PAL or XINE_TVSYSTEM_NTSC */ -void xine_tvmode_set_tvsystem(xine_t *self, xine_tvsystem system) XINE_PROTECTED; - -/* try to change TV state if enabled - * type select 'regular' (0) or 'TV' (1) state - * width frame width the mode should match best or 0 if unknown - * height frame height the mode should match best or 0 if unknown - * fps frame rate the mode should match best or 0 if unknown - * returns: finally selected state - */ -int xine_tvmode_switch (xine_t *self, int type, int width, int height, double fps) XINE_PROTECTED; - -/* adapt (maximum) output size to visible area if necessary and return pixel - * aspect and real frame rate if available - */ -void xine_tvmode_size (xine_t *self, int *width, int *height, - double *pixelratio, double *fps) XINE_PROTECTED; - -/* restore old TV and X settings and close nvtvd connection */ -void xine_tvmode_exit (xine_t *self) XINE_PROTECTED; - -#endif - #ifdef __cplusplus } #endif diff --git a/m4/attributes.m4 b/m4/attributes.m4 index 1f4750a71..737a31bcb 100644 --- a/m4/attributes.m4 +++ b/m4/attributes.m4 @@ -55,7 +55,7 @@ AC_DEFUN([CC_CHECK_LDFLAGS], [ AS_TR_SH([cc_cv_ldflags_$1]), [ac_save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $1" - AC_LINK_IFELSE([int a;], + AC_LINK_IFELSE([int main() { return 1; }], [eval "AS_TR_SH([cc_cv_ldflags_$1])='yes'"], [eval "AS_TR_SH([cc_cv_ldflags_$1])="]) LDFLAGS="$ac_save_LDFLAGS" diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am index 36c48a3c9..b90bd0ee9 100644 --- a/src/xine-engine/Makefile.am +++ b/src/xine-engine/Makefile.am @@ -28,7 +28,7 @@ libxine_la_SOURCES = xine.c metronom.c configfile.c buffer.c \ load_plugins.c video_decoder.c buffer_types.c \ audio_decoder.c video_out.c audio_out.c resample.c events.c \ video_overlay.c osd.c spu.c scratch.c demux.c vo_scale.c \ - xine_interface.c post.c tvmode.c broadcaster.c io_helper.c \ + xine_interface.c post.c broadcaster.c io_helper.c \ input_rip.c input_cache.c info_helper.c refcounter.c \ alphablend.c diff --git a/src/xine-engine/tvmode.c b/src/xine-engine/tvmode.c deleted file mode 100644 index 099bdb808..000000000 --- a/src/xine-engine/tvmode.c +++ /dev/null @@ -1,65 +0,0 @@ -/* - * 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 - * - * tvmode - TV output selection - * - * Currently uses nvtvd (Dirk Thierbach <dthierbach@gmx.de>) - * for setting TV mode - * xine support hacked in by Matthias Hopf <mat@mshopf.de> - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <unistd.h> - -#include "xine_internal.h" -#include "xineutils.h" - -/* nvtv support is deprecated (and will be removed) - * these dummy functions are only here to prevent serious breakage - * until front ends are updated. - */ - -int xine_tvmode_switch (xine_t *this, int type, int width, int height, double fps) { - /* not supported: return regular mode */ - return 0; -} - -void xine_tvmode_size (xine_t *this, int *width, int *height, - double *pixelratio, double *fps) { -} - -int xine_tvmode_init (xine_t *this) { - return 0; -} - -void xine_tvmode_exit (xine_t *this) { -} - -void xine_tvmode_set_tvsystem(xine_t *self, xine_tvsystem system) { -} - -int xine_tvmode_use(xine_t *self, int use_tvmode) { - return 0; -} diff --git a/src/xine-engine/xine_interface.c b/src/xine-engine/xine_interface.c index 50d8796e8..7913a18d6 100644 --- a/src/xine-engine/xine_interface.c +++ b/src/xine-engine/xine_interface.c @@ -322,15 +322,6 @@ void xine_config_reset (xine_t *this) { pthread_mutex_unlock(&config->config_lock); } -#ifndef XINE_DISABLE_DEPRECATED_FEATURES -int xine_gui_send_vo_data (xine_stream_t *stream, - int type, void *data) { - - return stream->video_driver->gui_data_exchange (stream->video_driver, - type, data); -} -#endif - int xine_port_send_gui_data (xine_video_port_t *vo, int type, void *data) { |