Merge from 1.2.

1 files changed, 19 insertions, 1 deletions

diff --git a/src/dxr3/dxr3.h b/src/dxr3/dxr3.h
index 0b0961ca0..12dedf07f 100644
--- a/src/dxr3/dxr3.h
+++ b/src/dxr3/dxr3.h
@@ -25,6 +25,10 @@
 
 #include <xine/xine_internal.h>
 
+#ifndef LOG_VID
+#define LOG_VID 0
+#endif
+
 /* data for the device name config entry */
 #define CONF_KEY  "dxr3.device_number"
 #define CONF_NAME _("DXR3 device number")
@@ -37,5 +41,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 *)stream->video_driver->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