Combine vdr plugins into a single binary.

Several files were renamed for consistency.

--HG--
rename : include/xine/input_vdr.h => include/xine/vdr.h
rename : src/vdr/post_vdr.c => src/vdr/combined_vdr.c
rename : src/vdr/post_vdr.h => src/vdr/combined_vdr.h

8 files changed, 26 insertions, 39 deletions

diff --git a/include/xine/Makefile.am b/include/xine/Makefile.am
index cad6adb31..cc086dfaf 100644
--- a/include/xine/Makefile.am
+++ b/include/xine/Makefile.am
@@ -8,4 +8,4 @@ xineinclude_HEADERS = version.h buffer.h metronom.h configfile.h vo_scale.h \
 	io_helper.h broadcaster.h info_helper.h refcounter.h alphablend.h \
 	demux.h input_plugin.h attributes.h compat.h xine_buffer.h \
 	xineutils.h xmllexer.h xmlparser.h list.h array.h sorted_array.h \
-	pool.h ring_buffer.h os_types.h input_vdr.h
+	pool.h ring_buffer.h os_types.h vdr.h
diff --git a/include/xine/input_vdr.h b/include/xine/vdr.h
index 41c96d741..faec3b966 100644
--- a/include/xine/input_vdr.h
+++ b/include/xine/vdr.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  */
 
-#ifndef __INPUT_VDR_H
-#define __INPUT_VDR_H
+#ifndef __VDR_H
+#define __VDR_H
 
 
 #define XINE_INPUT_VDR_VERSION 712
@@ -612,5 +612,5 @@ event_union_t;
 
 
 
-#endif /* __INPUT_VDR_H */
+#endif /* __VDR_H */
 
diff --git a/src/vdr/Makefile.am b/src/vdr/Makefile.am
index e4912176a..cfbd86be0 100644
--- a/src/vdr/Makefile.am
+++ b/src/vdr/Makefile.am
@@ -4,12 +4,8 @@ AM_CFLAGS  = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
 AM_LDFLAGS = $(xineplug_ldflags)
 
 if ENABLE_DVB
-xineplug_LTLIBRARIES = xineplug_inp_vdr.la
-xinepost_LTLIBRARIES = xineplug_post_vdr.la
+xineplug_LTLIBRARIES = xineplug_vdr.la
 endif
 
-xineplug_inp_vdr_la_SOURCES = input_vdr.c
-xineplug_inp_vdr_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS)
-
-xineplug_post_vdr_la_SOURCES = post_vdr.c post_vdr_video.c post_vdr_audio.c post_vdr.h
-xineplug_post_vdr_la_LIBADD = $(XINE_LIB)
+xineplug_vdr_la_SOURCES = combined_vdr.c combined_vdr.h input_vdr.c post_vdr_video.c post_vdr_audio.c
+xineplug_vdr_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS)
diff --git a/src/vdr/post_vdr.c b/src/vdr/combined_vdr.c
index 77b8b56fc..382f490cb 100644
--- a/src/vdr/post_vdr.c
+++ b/src/vdr/combined_vdr.c
@@ -24,19 +24,21 @@
 
 #include <xine/xine_internal.h>
 #include <xine/post.h>
-#include "post_vdr.h"
+#include "combined_vdr.h"
 
 
 
 static const post_info_t vdr_video_special_info = { XINE_POST_TYPE_VIDEO_FILTER };
 static const post_info_t vdr_audio_special_info = { XINE_POST_TYPE_AUDIO_FILTER };
 
+/* exported plugin catalog entry */
 const plugin_info_t xine_plugin_info[] EXPORTED =
 {
-  /* type, API, "name", version, special_info, init_function */  
-  { PLUGIN_POST, 9, "vdr"      , XINE_VERSION_CODE, &vdr_video_special_info, &vdr_video_init_plugin },
-  { PLUGIN_POST, 9, "vdr_video", XINE_VERSION_CODE, &vdr_video_special_info, &vdr_video_init_plugin },
-  { PLUGIN_POST, 9, "vdr_audio", XINE_VERSION_CODE, &vdr_audio_special_info, &vdr_audio_init_plugin },
-  { PLUGIN_NONE, 0, "", 0, NULL, NULL }
+  /* type       , API, "name"     , version          , special_info           , init_function */  
+  { PLUGIN_INPUT,  18, "VDR"      , XINE_VERSION_CODE, NULL                   , &vdr_input_init_plugin },
+  { PLUGIN_POST ,   9, "vdr"      , XINE_VERSION_CODE, &vdr_video_special_info, &vdr_video_init_plugin },
+  { PLUGIN_POST ,   9, "vdr_video", XINE_VERSION_CODE, &vdr_video_special_info, &vdr_video_init_plugin },
+  { PLUGIN_POST ,   9, "vdr_audio", XINE_VERSION_CODE, &vdr_audio_special_info, &vdr_audio_init_plugin },
+  { PLUGIN_NONE ,   0, ""         , 0                , NULL                   , NULL }
 };
 
diff --git a/src/vdr/post_vdr.h b/src/vdr/combined_vdr.h
index 46aa8dcb3..a802e7f2f 100644
--- a/src/vdr/post_vdr.h
+++ b/src/vdr/combined_vdr.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  */
 
-#ifndef __POST_VDR_H
-#define __POST_VDR_H
+#ifndef __COMBINED_VDR_H
+#define __COMBINED_VDR_H
 
 
 
@@ -72,10 +72,11 @@ inline static int vdr_is_vdr_stream(xine_stream_t *stream)
 
 
 /* plugin class initialization function */
-void *vdr_video_init_plugin(xine_t *xine, void *);
-void *vdr_audio_init_plugin(xine_t *xine, void *);
+void *vdr_input_init_plugin(xine_t *xine, void *data);
+void *vdr_video_init_plugin(xine_t *xine, void *data);
+void *vdr_audio_init_plugin(xine_t *xine, void *data);
 
 
 
-#endif /* __POST_VDR_H */
+#endif /* __COMBINED_VDR_H */
 
diff --git a/src/vdr/input_vdr.c b/src/vdr/input_vdr.c
index 91c3fa454..9634faa96 100644
--- a/src/vdr/input_vdr.c
+++ b/src/vdr/input_vdr.c
@@ -45,8 +45,8 @@
 #include <xine/xineutils.h>
 #include <xine/input_plugin.h>
 
-#include <xine/input_vdr.h>
-#include "post_vdr.h"
+#include <xine/vdr.h>
+#include "combined_vdr.h"
 
 
 
@@ -2042,7 +2042,7 @@ static char **vdr_class_get_autoplay_list(input_class_t *this_gen,
   return class->mrls;
 }
 
-static void *init_class(xine_t *xine, void *data)
+void *vdr_input_init_plugin(xine_t *xine, void *data)
 {
   vdr_input_class_t *this;
   
@@ -2065,15 +2065,3 @@ static void *init_class(xine_t *xine, void *data)
 
   return this;
 }
-
-/*
- * exported plugin catalog entry
- */
-
-const plugin_info_t xine_plugin_info[] EXPORTED =
-{
-  /* type, API, "name", version, special_info, init_function */
-  { PLUGIN_INPUT, 18, "VDR", XINE_VERSION_CODE, NULL, init_class },
-  { PLUGIN_NONE, 0, "", 0, NULL, NULL }
-};
-
diff --git a/src/vdr/post_vdr_audio.c b/src/vdr/post_vdr_audio.c
index 79015ec21..ca45ecd35 100644
--- a/src/vdr/post_vdr_audio.c
+++ b/src/vdr/post_vdr_audio.c
@@ -30,7 +30,7 @@
 
 #include <xine/xine_internal.h>
 #include <xine/post.h>
-#include "post_vdr.h"
+#include "combined_vdr.h"
 
 
 
diff --git a/src/vdr/post_vdr_video.c b/src/vdr/post_vdr_video.c
index 8e66c8eb5..ff6c32504 100644
--- a/src/vdr/post_vdr_video.c
+++ b/src/vdr/post_vdr_video.c
@@ -30,7 +30,7 @@
 
 #include <xine/xine_internal.h>
 #include <xine/post.h>
-#include "post_vdr.h"
+#include "combined_vdr.h"