diff options
| -rw-r--r-- | include/video_out.h | 5 | ||||
| -rw-r--r-- | include/xine.h.tmpl.in | 27 |
2 files changed, 11 insertions, 21 deletions
diff --git a/include/video_out.h b/include/video_out.h index 3a4ba0b72..03503fd69 100644 --- a/include/video_out.h +++ b/include/video_out.h @@ -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.h,v 1.1 2001/04/18 22:36:44 f1rmb Exp $ + * $Id: video_out.h,v 1.2 2001/04/18 23:48:29 guenter Exp $ * * * xine version of video_out.h @@ -322,6 +322,3 @@ static inline void vo_draw (vo_frame_t * frame) #endif #warning "FIXME" #endif - - - diff --git a/include/xine.h.tmpl.in b/include/xine.h.tmpl.in index 9f468cdd2..4a03e5cff 100644 --- a/include/xine.h.tmpl.in +++ b/include/xine.h.tmpl.in @@ -17,32 +17,22 @@ * 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.h.tmpl.in,v 1.1 2001/04/18 22:36:42 f1rmb Exp $ + * $Id: xine.h.tmpl.in,v 1.2 2001/04/18 23:48:29 guenter Exp $ * */ #ifndef HAVE_XINE_H #define HAVE_XINE_H -#if !defined(XINE_COMPILE) - -#include <inttypes.h> -#include "input_plugin.h" -#include "audio_out.h" -#include "video_out.h" -#include "configfile.h" -#include "demux.h" - #define XINE_MAJOR_VERSION @XINE_MAJOR@ #define XINE_MINOR_VERSION @XINE_MINOR@ #define XINE_SUB_VERSION @XINE_SUB@ - +typedef void vo_instance_t; +typedef void ao_functions_t; +typedef void config_values_t; typedef void xine_t; -#endif - - /* nStatus : current xine status */ typedef void (*gui_status_callback_func_t)(int nStatus); @@ -55,7 +45,12 @@ typedef void (*gui_status_callback_func_t)(int nStatus); #define XINE_PAUSE 2 #define XINE_QUIT 3 -#if !defined(XINE_COMPILE) +/* + * read config file and init a config object + * (if it exists) + */ +config_values_t *config_file_init (char *filename); + /* * init xine - call once at startup * @@ -167,5 +162,3 @@ char **xine_get_autoplay_input_plugin_ids (xine_t *this) ; char **xine_get_autoplay_mrls (xine_t *this, char *plugin_id); #endif - -#endif |