0
@@ -14,9 +14,11 @@ VERS = ENV['VERSION'] || "0.r#{REVISION}"
0
 PKG = "#{NAME}-#{VERS}"
0
 APPARGS = ENV['APPARGS']
0
 FLAGS = %w[DEBUG VIDEO]
0
+VLC_VERSION = `vlc --version 2>/dev/null`.split[2]
0
+VLC_0_8 = VLC_VERSION !~ /^0\.9/
0
 
0
 BIN = "*.{bundle,jar,o,so,obj,pdb,pch,res,lib,def,exp,exe,ilk}"
0
-CLEAN.include ["{bin,shoes}/#{BIN}", "dist"]
0
+CLEAN.include ["{bin,shoes}/#{BIN}", "req/**/#{BIN}", "dist"]
0
 
0
 # Guess the environment
0
 unless ENV['MSVC'] or ENV['DDKBUILDENV']
0
@@ -217,7 +219,7 @@ when /win32/
0
     /Ideps\ruby\lib\ruby\1.8\i386-mswin32
0
     /Ideps\curl\include
0
     /Ideps\winhttp\include
0
-    /I. /DWINVER=0x0500 /D_WIN32_WINNT=0x0500
0
+    /I. /DVLC_0_8 /DWINVER=0x0500 /D_WIN32_WINNT=0x0500
0
     /O2 /GR /EHsc
0
   ].gsub(/\n\s*/, ' ')
0
 
0
@@ -348,7 +350,14 @@ else
0
     LINUX_LDFLAGS =" #{`pkg-config --libs gtk+-2.0`.strip} #{`curl-config --libs`.strip} -fPIC -shared"
0
     LINUX_LIB_NAMES << 'jpeg'
0
     LINUX_LIB_NAMES << 'rt'
0
-    LINUX_LIB_NAMES << "vlc" if ENV['VIDEO']
0
+    if ENV['VIDEO']
0
+      if VLC_0_8
0
+        LINUX_CFLAGS << " -DVLC_0_8"
0
+      else
0
+        LINUX_CFLAGS << " -I/usr/include/vlc/plugins"
0
+      end
0
+      LINUX_LIB_NAMES << "vlc"
0
+    end
0
   end
0
   LINUX_LIBS = LINUX_LIB_NAMES.map { |x| "-l#{x}" }.join(' ')
0
 

0
@@ -13,6 +13,30 @@
0
 #include <cairo.h>
0
 #include <ruby.h>
0
 
0
+#ifdef VIDEO
0
+#ifdef VLC_0_8
0
+#include <vlc/libvlc.h>
0
+#define SHOES_VLC(self_t) self_t->vlc
0
+#define shoes_libvlc_clear libvlc_playlist_clear
0
+#define shoes_libvlc_prev  libvlc_playlist_prev
0
+#define shoes_libvlc_next  libvlc_playlist_next
0
+#define shoes_libvlc_pause libvlc_playlist_pause
0
+#define shoes_libvlc_stop  libvlc_playlist_stop
0
+#else
0
+#include <vlc/vlc.h>
0
+#include <vlc/libvlc.h>
0
+#define libvlc_destroy libvlc_release
0
+#define vlc_int64_t     libvlc_time_t
0
+#define shoes_libvlc_clear libvlc_media_player_pause
0
+#define shoes_libvlc_prev  libvlc_media_player_stop
0
+#define shoes_libvlc_next  libvlc_media_player_stop
0
+#define shoes_libvlc_pause libvlc_media_player_pause
0
+#define shoes_libvlc_stop  libvlc_media_player_stop
0
+#define SHOES_VLC(self_t) shoes_world->vlc
0
+#define VLC_0_9
0
+#endif
0
+#endif
0
+
0
 #include "shoes/canvas.h"
0
 #include "shoes/code.h"
0
 #include "shoes/config.h"

0
@@ -3,8 +3,8 @@
0
 // Ruby methods for all the drawing ops.
0
 //
0
 #include "shoes/internal.h"
0
-#include "shoes/canvas.h"
0
 #include "shoes/app.h"
0
+#include "shoes/canvas.h"
0
 #include "shoes/ruby.h"
0
 #include "shoes/world.h"
0
 #include "shoes/native.h"

0
@@ -11,9 +11,6 @@
0
 #include <cairo-pdf.h>
0
 
0
 #include <pango/pangocairo.h>
0
-#ifdef VIDEO
0
-#include <vlc/libvlc.h>
0
-#endif
0
 #include <ruby.h>
0
 
0
 #include "shoes/config.h"
0
@@ -218,7 +215,11 @@ typedef struct {
0
   shoes_place place;
0
   SHOES_CONTROL_REF ref;
0
   libvlc_exception_t excp;
0
+#ifdef VLC_0_8
0
   libvlc_instance_t *vlc;
0
+#else
0
+  libvlc_media_player_t *vlc;
0
+#endif
0
   int init;
0
   VALUE path;
0
   SHOES_SLOT_OS *slot;

0
@@ -3,8 +3,8 @@
0
 // The blurring and shadowing effects.
0
 //
0
 #include "shoes/internal.h"
0
-#include "shoes/canvas.h"
0
 #include "shoes/app.h"
0
+#include "shoes/canvas.h"
0
 #include "shoes/ruby.h"
0
 #include <math.h>
0
 

0
@@ -1238,15 +1238,16 @@ shoes_video_mark(shoes_video *video)
0
 static void
0
 shoes_video_free(shoes_video *video)
0
 {
0
+#ifdef VLC_0_8
0
   if (video->vlc != NULL)
0
     libvlc_destroy(video->vlc);
0
+#endif
0
   RUBY_CRITICAL(SHOE_FREE(video));
0
 }
0
 
0
 VALUE
0
 shoes_video_new(VALUE klass, VALUE path, VALUE attr, VALUE parent)
0
 {
0
-  GError *error = NULL;
0
   shoes_video *video;
0
   VALUE obj = shoes_video_alloc(klass);
0
   Data_Get_Struct(obj, shoes_video, video);
0
@@ -1275,7 +1276,8 @@ shoes_video_alloc(VALUE klass)
0
 #endif
0
   obj = Data_Wrap_Struct(klass, shoes_video_mark, shoes_video_free, video);
0
   libvlc_exception_init(&video->excp);
0
-  video->vlc = libvlc_new(ppsz_argc, ppsz_argv, NULL);
0
+  if (SHOES_VLC(video) == NULL)
0
+    SHOES_VLC(video) = libvlc_new(ppsz_argc, ppsz_argv, NULL);
0
   video->path = Qnil;
0
   video->attr = Qnil;
0
   video->parent = Qnil;
0
@@ -1328,14 +1330,27 @@ shoes_video_draw(VALUE self, VALUE c, VALUE actual)
0
       {
0
         self_t->init = 1;
0
 
0
+#ifdef VLC_0_8
0
         int play_id = libvlc_playlist_add(self_t->vlc, 
0
           RSTRING_PTR(self_t->path), NULL, &self_t->excp);
0
+#else
0
+        libvlc_media_t *play = libvlc_media_new(shoes_world->vlc,
0
+          RSTRING_PTR(self_t->path), &self_t->excp);
0
+        shoes_vlc_exception(&self_t->excp);
0
+        self_t->vlc = libvlc_media_player_new_from_media(play, &self_t->excp);
0
+        shoes_vlc_exception(&self_t->excp);
0
+        libvlc_media_release(play);
0
+#endif
0
         shoes_vlc_exception(&self_t->excp);
0
 
0
         self_t->ref = shoes_native_surface_new(canvas, self, &self_t->place);
0
         shoes_native_surface_position(self_t->ref, &self_t->place, self, canvas, &place);
0
 
0
+#ifdef VLC_0_8
0
         libvlc_video_set_parent(self_t->vlc, DRAWABLE(self_t->ref), &self_t->excp);
0
+#else
0
+        libvlc_media_player_set_drawable(self_t->vlc, DRAWABLE(self_t->ref), &self_t->excp);
0
+#endif
0
         shoes_vlc_exception(&self_t->excp);
0
 
0
 #ifdef SHOES_QUARTZ
0
@@ -1354,7 +1369,11 @@ shoes_video_draw(VALUE self, VALUE c, VALUE actual)
0
         if (RTEST(ATTR(self_t->attr, autoplay)))
0
         {
0
           INFO("Starting playlist.\n");
0
+#ifdef VLC_0_8
0
           libvlc_playlist_play(self_t->vlc, 0, 0, NULL, &self_t->excp);
0
+#else
0
+          libvlc_media_player_play(self_t->vlc, &self_t->excp);
0
+#endif
0
           shoes_vlc_exception(&self_t->excp);
0
         }
0
       }
0
@@ -1377,9 +1396,15 @@ shoes_video_is_playing(VALUE self)
0
   GET_STRUCT(video, self_t);
0
   if (self_t->init == 1)
0
   {
0
+#ifdef VLC_0_8
0
     int isp = libvlc_playlist_isplaying(self_t->vlc, &self_t->excp);
0
     shoes_vlc_exception(&self_t->excp);
0
     return isp == 0 ? Qfalse : Qtrue;
0
+#else
0
+    libvlc_state_t s = libvlc_media_player_get_state(self_t->vlc, &self_t->excp);
0
+    shoes_vlc_exception(&self_t->excp);
0
+    return s == libvlc_Playing ? Qtrue : Qfalse;
0
+#endif
0
   }
0
   return Qfalse;
0
 }
0
@@ -1390,7 +1415,11 @@ shoes_video_play(VALUE self)
0
   GET_STRUCT(video, self_t);
0
   if (self_t->init == 1)
0
   {
0
+#ifdef VLC_0_8
0
     libvlc_playlist_play(self_t->vlc, 0, 0, NULL, &self_t->excp);
0
+#else
0
+    libvlc_media_player_play(self_t->vlc, &self_t->excp);
0
+#endif
0
     shoes_vlc_exception(&self_t->excp);
0
   }
0
   return self;
0
@@ -1403,12 +1432,13 @@ shoes_video_play(VALUE self)
0
     GET_STRUCT(video, self_t); \
0
     if (self_t->init == 1) \
0
     { \
0
-      libvlc_playlist_##x(self_t->vlc, &self_t->excp); \
0
+      shoes_libvlc_##x(self_t->vlc, &self_t->excp); \
0
       shoes_vlc_exception(&self_t->excp); \
0
     } \
0
     return self; \
0
   }
0
 
0
+#ifdef VLC_0_8
0
 #define VIDEO_GET_METHOD(x, ctype, rbtype) \
0
   VALUE shoes_video_get_##x(VALUE self) \
0
   { \
0
@@ -1439,6 +1469,32 @@ shoes_video_play(VALUE self)
0
     } \
0
     return val; \
0
   }
0
+#else
0
+#define VIDEO_GET_METHOD(x, ctype, rbtype) \
0
+  VALUE shoes_video_get_##x(VALUE self) \
0
+  { \
0
+    GET_STRUCT(video, self_t); \
0
+    if (self_t->init == 1) \
0
+    { \
0
+      ctype len = libvlc_media_player_get_##x(self_t->vlc, &self_t->excp); \
0
+      shoes_vlc_exception(&self_t->excp); \
0
+      return rbtype(len); \
0
+    } \
0
+    return Qnil; \
0
+  }
0
+
0
+#define VIDEO_SET_METHOD(x, rbconv) \
0
+  VALUE shoes_video_set_##x(VALUE self, VALUE val) \
0
+  { \
0
+    GET_STRUCT(video, self_t); \
0
+    if (self_t->init == 1) \
0
+    { \
0
+      libvlc_media_player_set_##x(self_t->vlc, rbconv(val), &self_t->excp); \
0
+      shoes_vlc_exception(&self_t->excp); \
0
+    } \
0
+    return val; \
0
+  }
0
+#endif
0
 
0
 VIDEO_METHOD(clear);
0
 VIDEO_METHOD(prev);

0
@@ -67,6 +67,9 @@ shoes_world_free_image_cache(char *key, shoes_cache_entry *cached, char *arg)
0
 void
0
 shoes_world_free(shoes_world_t *world)
0
 {
0
+#ifdef VLC_0_9
0
+  if (world->vlc != NULL) libvlc_release(world->vlc);
0
+#endif
0
   shoes_native_cleanup(world);
0
   st_foreach(world->image_cache, CASTFOREACH(shoes_world_free_image_cache), 0);
0
   st_free_table(world->image_cache);

0
@@ -25,6 +25,9 @@ SHOES_EXTERN typedef struct _shoes_world_t {
0
   cairo_surface_t *blank_image;
0
   shoes_cached_image *blank_cache;
0
   PangoFontDescription *default_font;
0
+#ifdef VLC_0_9
0
+  libvlc_instance_t *vlc;
0
+#endif
0
 } shoes_world_t;
0
 
0
 extern SHOES_EXTERN shoes_world_t *shoes_world;