* QNX RTOS plug-in by Jon Lech Johansen.

AUTHORS

@@ -127,6 +127,7 @@ N: Jon Lech Johansen
 E: jon-vl@nanocrew.net
 D: PS input fixes
 D: Win32 DVD input port
+D: QNX RTOS plug-in
 
 N: Michel Kaempf
 E: maxx@via.ecp.fr

ChangeLog

@@ -63,6 +63,7 @@ HEAD
   * Kludged so that times displayed in the scrollbar are finally correct
     for MPEG-2 streams.
   * FreeBSD compilation fix by Øyvind Kolbu.
+  * QNX RTOS plug-in by Jon Lech Johansen.
 
 0.2.80
 Tue,  5 Jun 2001 04:41:06 +0200

Makefile.opts.in

@@ -74,6 +74,7 @@ LIB_GTK = @LIB_GTK@
 LIB_IDCTALTIVEC = @LIB_IDCTALTIVEC@
 LIB_KDE = @LIB_KDE@
 LIB_MACOSX = @LIB_MACOSX@
+LIB_QNX = @LIB_QNX@
 LIB_NCURSES = @LIB_NCURSES@
 LIB_QT = @LIB_QT@
 LIB_TS = @LIB_TS@

configure.in

@@ -412,6 +412,18 @@ AC_ARG_ENABLE(macosx,
      LIB_SDL="${LIB_SDL} -framework AGL -framework Carbon"
    )])
 
+dnl
+dnl  QNX RTOS module
+dnl
+AC_ARG_ENABLE(qnx,
+  [  --disable-qnx           QNX RTOS support (default enabled)])
+    if test x$enable_qnx != xno; then
+      AC_CHECK_HEADERS(Ph.h, [
+        PLUGINS="${PLUGINS} qnx"
+        LIB_QNX="-lasound -lph"
+      ])
+    fi
+
 dnl
 dnl  Linux framebuffer module
 dnl
@@ -656,6 +668,7 @@ AC_SUBST(LIB_GTK)
 AC_SUBST(LIB_IDCTALTIVEC)
 AC_SUBST(LIB_KDE)
 AC_SUBST(LIB_MACOSX)
+AC_SUBST(LIB_QNX)
 AC_SUBST(LIB_NCURSES)
 AC_SUBST(LIB_QT)
 AC_SUBST(LIB_TS)

extras/libdvdcss/ioctl.c

@@ -2,7 +2,7 @@
  * ioctl.c: DVD ioctl replacement function
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: ioctl.c,v 1.3 2001/06/25 11:34:08 sam Exp $
+ * $Id: ioctl.c,v 1.4 2001/07/19 11:50:50 massiot Exp $
  *
  * Authors: Markus Kuespert <ltlBeBoy@beosmail.com>
  *          Samuel Hocevar <sam@zoy.org>
@@ -168,6 +168,16 @@ int ioctl_ReadCopyright( int i_fd, int i_layer, int *pi_copyright )
         *pi_copyright = p_buffer[ 4 ];
     }
 
+#elif defined( __QNXNTO__ )
+    /*
+        QNX RTOS currently doesn't have a CAM
+        interface (they're working on it though).
+        Assume DVD is not encrypted.
+    */
+
+    *pi_copyright = 0;
+    i_ret = 0;
+
 #else
     /* DVD ioctls unavailable - do as if the ioctl failed */
     i_ret = -1;

include/defs.h.in

-/* include/defs.h.in.  Generated automatically from configure.in by autoheader 2.13.  */
+/* include/defs.h.in.  Generated automatically from configure.in by autoheader.  */
 
 /* Define to empty if the keyword does not work.  */
 #undef const
@@ -61,6 +61,9 @@
 /* Define if you have the <Carbon/Carbon.h> header file.  */
 #undef HAVE_CARBON_CARBON_H
 
+/* Define if you have the <Ph.h> header file.  */
+#undef HAVE_PH_H
+
 /* Define if you have the <SDL/SDL.h> header file.  */
 #undef HAVE_SDL_SDL_H
 

plugins/qnx/Makefile

+###############################################################################
+# vlc (VideoLAN Client) QNX RTOS module Makefile
+# (c)2001 VideoLAN
+###############################################################################
+
+#
+# Objects
+#
+
+PLUGIN_C = qnx.o aout_qnx.o vout_qnx.o
+BUILTIN_C = $(PLUGIN_C:%.o=BUILTIN_%.o)
+
+ALL_OBJ = $(PLUGIN_C) $(BUILTIN_C)
+
+#
+# Virtual targets
+#
+
+include ../../Makefile.modules
+
+#
+# Real targets
+#
+
+../../plugins/qnx.so: $(PLUGIN_C)
+	$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_QNX) 
+
+../../plugins/qnx.a: $(BUILTIN_C)
+	ar r $@ $^

plugins/qnx/qnx.c

+/*****************************************************************************
+ * qnx.c : QNX RTOS plugin for vlc
+ *****************************************************************************
+ * Copyright (C) 2000, 2001 VideoLAN
+ *
+ * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
+ *      
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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, USA.
+ *****************************************************************************/
+
+#define MODULE_NAME qnx 
+#include "modules_inner.h"
+
+/*****************************************************************************
+ * Preamble
+ *****************************************************************************/
+#include "defs.h"
+
+#include <stdlib.h>                                      /* malloc(), free() */
+
+#include "config.h"
+#include "common.h"                                     /* boolean_t, byte_t */
+#include "threads.h"
+#include "mtime.h"
+
+#include "video.h"
+#include "video_output.h"
+
+#include "modules.h"
+#include "modules_export.h"
+
+/*****************************************************************************
+ * Capabilities defined in the other files.
+ ******************************************************************************/
+void _M( aout_getfunctions )( function_list_t * p_function_list );
+void _M( vout_getfunctions )( function_list_t * p_function_list );
+
+/*****************************************************************************
+ * Building configuration tree
+ *****************************************************************************/
+MODULE_CONFIG_START
+ADD_WINDOW( "Configuration for QNX RTOS module" )
+    ADD_COMMENT( "For now, the QNX RTOS module cannot be configured" )
+MODULE_CONFIG_STOP
+
+MODULE_INIT_START
+    p_module->psz_longname = "QNX RTOS module";
+    p_module->i_capabilities = MODULE_CAPABILITY_NULL
+                                | MODULE_CAPABILITY_AOUT
+                                | MODULE_CAPABILITY_VOUT;
+MODULE_INIT_STOP
+
+MODULE_ACTIVATE_START
+    _M( aout_getfunctions )( &p_module->p_functions->aout );
+    _M( vout_getfunctions )( &p_module->p_functions->vout );
+MODULE_ACTIVATE_STOP
+
+MODULE_DEACTIVATE_START
+MODULE_DEACTIVATE_STOP