Changeset 34f237461596f6e3b79b81a982b11113978b78a4

Timestamp:

07/07/03 18:59:00 (5 years ago)

Author:

Sam Hocevar <sam@videolan.org>

git-committer:

Sam Hocevar <sam@videolan.org> 1057597140 +0000

git-parent:

[76bbfbacd9a03ee59875db49c5a31c0f854227d5]

git-author:

Sam Hocevar <sam@videolan.org> 1057597140 +0000

Message:

• modules/control/corba/: Olivier Aubert's CORBA plugin. Almost verbatim,
  compiles cleanly (to build the medicacontrol.so library you need to cd to
  that directory and "make medicacontrol.so") but untested.
  
• src/playlist/playlist.c: Mostly harmless fix to playlist.c suggested by
  Olivier.
  

Files:

• configure.ac (modified) (3 diffs)
• modules/control/corba/.cvsignore (added)
• modules/control/corba/Modules.am (added)
• modules/control/corba/README (added)
• modules/control/corba/client.py (added)
• modules/control/corba/corba.c (added)
• modules/control/corba/launch-vlc-corba (added)
• modules/control/corba/mediacontrol.idl (added)
• modules/control/corba/pyorbit-1.99.3.patch (added)
• modules/control/corba/simpleplayer.glade (added)
• modules/control/corba/simpleplayer.py (added)
• src/playlist/playlist.c (modified) (2 diffs)

configure.ac

@@ -1 +1 @@
-dnl Autoconf settings for vlc
-6 2003/07/07 14:56:22 massiot
+7 2003/07/07 16:59:00 sam
-
-AC_INIT(vlc,0.6.0)
@@ -2928 +2928 @@
-    AX_ADD_PLUGINS([lirc])
-    AX_ADD_LDFLAGS([lirc],[-llirc_client])
+  fi
+fi
+
+dnl
+dnl corba (ORBit) plugin
+dnl
+AC_ARG_ENABLE(corba,
+  [  --enable-corba          corba interface support (default disabled)])
+if test "${enable_corba}" = "yes"; then
+  ORBIT_PATH="${PATH}"
+  AC_ARG_WITH(orbit-config-path,
+  [    --with-orbit-config-path=PATH orbit-config path (default search in \$PATH)])
+  if test "${with_orbit_config_path}" != "no"; then
+    ORBIT_PATH="${with_orbit_config_path}:${PATH}"
+  fi
+  # look for orbit2-config
+  AC_PATH_PROG(ORBIT_CONFIG, orbit2-config, no, ${ORBIT_PATH})
+  if test "${ORBIT_CONFIG}" != "no"; then
+    AX_ADD_CFLAGS(corba,[`${ORBIT_CONFIG} --cflags server`])
+    AX_ADD_LDFLAGS(corba,[`${ORBIT_CONFIG} --libs server | sed 's,-rdynamic,,'`])
+    # now look for the orbit.h header
+    CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_corba}"
+    ac_cv_corba_headers=yes
+    AC_CHECK_HEADERS(orbit/orbit.h, , [
+      ac_cv_corba_headers=no
+      AC_MSG_ERROR([Could not find corba development headers])
+    ])
+    if test "${ac_cv_corba_headers}" = "yes"; then
+      AX_ADD_PLUGINS(corba)
+    fi
+    CPPFLAGS="${CPPFLAGS_save}"
-  fi
-fi
@@ -3238 +3269 @@
-  modules/codec/spudec/Makefile
-  modules/control/Makefile
+  modules/control/corba/Makefile
-  modules/control/lirc/Makefile
-  modules/control/rc/Makefile

src/playlist/playlist.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
-0 2003/06/27 13:38:54
+1 2003/07/07 16:59:00
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -413 +413 @@
-        if( p_playlist->p_input )
-        {
+            PlayItem( p_playlist );
-            input_SetStatus( p_playlist->p_input, INPUT_STATUS_PLAY );
-        }