diff options
Diffstat (limited to 'src/xine-engine/xine_interface.c')
| -rw-r--r-- | src/xine-engine/xine_interface.c | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/src/xine-engine/xine_interface.c b/src/xine-engine/xine_interface.c index 166d7a3ef..c731a936f 100644 --- a/src/xine-engine/xine_interface.c +++ b/src/xine-engine/xine_interface.c @@ -15,13 +15,10 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - * $Id: xine_interface.c,v 1.104 2007/03/26 11:48:01 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * convenience/abstraction layer, functions to implement * libxine's public interface - * */ #ifdef HAVE_CONFIG_H @@ -35,7 +32,7 @@ #include <stdlib.h> #include <pthread.h> #include <stdarg.h> -#if defined (__linux__) +#if defined (__linux__) || defined (__GLIBC__) #include <endian.h> #elif defined (__FreeBSD__) #include <machine/endian.h> @@ -43,11 +40,11 @@ #define XINE_ENGINE_INTERNAL -#include "xine_internal.h" -#include "audio_out.h" -#include "video_out.h" -#include "demuxers/demux.h" -#include "post.h" +#include <xine/xine_internal.h> +#include <xine/audio_out.h> +#include <xine/video_out.h> +#include <xine/demux.h> +#include <xine/post.h> /* * version information / checking @@ -325,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) { @@ -947,13 +935,13 @@ xine_post_out_t * xine_get_audio_source(xine_stream_t *stream) { int _x_message(xine_stream_t *stream, int type, ...) { xine_ui_message_data_t *data; xine_event_t event; - char *explanation; + const char *explanation; int size; int n; va_list ap; char *s, *params; char *args[1025]; - static const char *std_explanation[] = { + static const char *const std_explanation[] = { "", N_("Warning:"), N_("Unknown host:"), |