Move dxr3_present() in dxr3.h to avoid duplicating the function.

3 files changed, 15 insertions, 30 deletions

diff --git a/src/dxr3/dxr3.h b/src/dxr3/dxr3.h
index 0b0961ca0..8a55129a0 100644
--- a/src/dxr3/dxr3.h
+++ b/src/dxr3/dxr3.h
@@ -37,5 +37,19 @@
  * (used by decoders to check for dxr3 presence) */
 #define DXR3_VO_ID "dxr3"
 
-#endif
+/* inline helper implementations */
+static inline int dxr3_present(xine_stream_t *stream)
+{
+  int present = 0;
+  
+  if (stream->video_driver && stream->video_driver->node &&
+      stream->video_driver->node->plugin_class ) {
+    const video_driver_class_t *const vo_class = (video_driver_class_t *)node->plugin_class;
+    if (vo_class->identifier)
+      present = (strcmp(vo_class->identifier, DXR3_VO_ID) == 0);
+  }
+  llprintf(LOG_VID, "dxr3 %s\n", present ? "present" : "not present");
+  return present;
+}
 
+#endif
diff --git a/src/dxr3/dxr3_decode_spu.c b/src/dxr3/dxr3_decode_spu.c
index f3163e331..01dd20b05 100644
--- a/src/dxr3/dxr3_decode_spu.c
+++ b/src/dxr3/dxr3_decode_spu.c
@@ -142,20 +142,6 @@ static int         dxr3_spudec_copy_nav_to_btn(dxr3_spudec_t *this, int32_t mode
 static inline void dxr3_swab_clut(int* clut);
 
 /* inline helper implementations */
-static inline int dxr3_present(xine_stream_t *stream)
-{
-  int present = 0;
-  
-  if (stream->video_driver && stream->video_driver->node &&
-      stream->video_driver->node->plugin_class ) {
-    const video_driver_class_t *const vo_class = (video_driver_class_t *)node->plugin_class;
-    if (vo_class->identifier)
-      present = (strcmp(vo_class->identifier, DXR3_VO_ID) == 0);
-  }
-  llprintf(LOG_VID, "dxr3 %s\n", present ? "present" : "not present");
-  return present;
-}
-
 static inline void dxr3_spudec_clear_nav_list(dxr3_spudec_t *this)
 {
   while (this->pci_cur.next) {
diff --git a/src/dxr3/dxr3_decode_video.c b/src/dxr3/dxr3_decode_video.c
index 9eb0527d1..4347fb808 100644
--- a/src/dxr3/dxr3_decode_video.c
+++ b/src/dxr3/dxr3_decode_video.c
@@ -143,7 +143,6 @@ typedef struct dxr3_decoder_s {
 } dxr3_decoder_t;
 
 /* helper functions */
-static inline int  dxr3_present(xine_stream_t *stream);
 static inline int  dxr3_mvcommand(int fd_control, int command);
 static        void parse_mpeg_header(dxr3_decoder_t *this, uint8_t *buffer);
 static        int  get_duration(dxr3_decoder_t *this);
@@ -156,20 +155,6 @@ static void      dxr3_update_enhanced_mode(void *this_gen, xine_cfg_entry_t *ent
 static void      dxr3_update_correct_durations(void *this_gen, xine_cfg_entry_t *entry);
 
 /* inline helper implementations */
-static inline int dxr3_present(xine_stream_t *stream)
-{
-  int present = 0;
-  
-  if (stream->video_driver && stream->video_driver->node &&
-      stream->video_driver->node->plugin_class ) {
-    const video_driver_class_t *const vo_class = (video_driver_class_t *)node->plugin_class;
-    if (vo_class->identifier)
-      present = (strcmp(vo_class->identifier, DXR3_VO_ID) == 0);
-  }
-  llprintf(LOG_VID, "dxr3 %s\n", present ? "present" : "not present");
-  return present;
-}
-
 static inline int dxr3_mvcommand(int fd_control, int command)
 {
   em8300_register_t reg;