Changeset 84d0f814c4aaeb01141e993879de1ce8b0c7fedb for bindings
- Timestamp:
- 05/15/08 18:40:44 (4 months ago)
- git-parent:
- Files:
-
- bindings/cil/src/exception.cs (modified) (2 diffs)
- bindings/cil/src/libvlc.cs (modified) (14 diffs)
- bindings/cil/tests/testvlc.cs (modified) (1 diff)
- bindings/java/core/src/main/java/org/videolan/jvlc/internal/LibVlc.java (modified) (1 diff)
- bindings/python/setup.py (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
bindings/cil/src/exception.cs
r66af5fd r84d0f81 1 1 /* 2 * libvlc.cs - libvlc -controlCIL bindings2 * libvlc.cs - libvlc CIL bindings 3 3 * 4 4 * $Id$ … … 69 69 IntPtr message; 70 70 71 [DllImport ("libvlc -control.dll", EntryPoint="libvlc_exception_init")]71 [DllImport ("libvlc.dll", EntryPoint="libvlc_exception_init")] 72 72 static extern void Init (NativeException e); 73 [DllImport ("libvlc -control.dll", EntryPoint="libvlc_exception_clear")]73 [DllImport ("libvlc.dll", EntryPoint="libvlc_exception_clear")] 74 74 static extern void Clear (NativeException e); 75 /*[DllImport ("libvlc -control.dll",75 /*[DllImport ("libvlc.dll", 76 76 EntryPoint="libvlc_exception_raised")] 77 77 static extern int Raised (NativeException e);*/ 78 [DllImport ("libvlc -control.dll",78 [DllImport ("libvlc.dll", 79 79 EntryPoint="libvlc_exception_get_message")] 80 80 static extern IntPtr GetMessage (NativeException e); bindings/cil/src/libvlc.cs
rbf1292e r84d0f81 1 1 /** 2 2 * @file libvlc.cs 3 * @brief libvlc -controlCIL bindings3 * @brief libvlc CIL bindings 4 4 * 5 5 * $Id$ … … 72 72 } 73 73 74 [DllImport ("libvlc -control.dll", EntryPoint="libvlc_new")]74 [DllImport ("libvlc.dll", EntryPoint="libvlc_new")] 75 75 internal static extern 76 76 InstanceHandle Create (int argc, U8String[] argv, NativeException ex); 77 77 78 [DllImport ("libvlc -control.dll", EntryPoint="libvlc_release")]78 [DllImport ("libvlc.dll", EntryPoint="libvlc_release")] 79 79 static extern void Destroy (IntPtr ptr, NativeException ex); 80 80 … … 116 116 } 117 117 118 [DllImport ("libvlc -control.dll", EntryPoint="libvlc_playlist_loop")]118 [DllImport ("libvlc.dll", EntryPoint="libvlc_playlist_loop")] 119 119 static extern void PlaylistLoop (InstanceHandle self, bool b, 120 120 NativeException ex); … … 129 129 } 130 130 131 [DllImport ("libvlc -control.dll", EntryPoint="libvlc_playlist_play")]131 [DllImport ("libvlc.dll", EntryPoint="libvlc_playlist_play")] 132 132 static extern void PlaylistPlay (InstanceHandle self, int id, int optc, 133 133 U8String[] optv, NativeException ex); … … 139 139 } 140 140 141 [DllImport ("libvlc -control.dll", EntryPoint="libvlc_playlist_pause")]141 [DllImport ("libvlc.dll", EntryPoint="libvlc_playlist_pause")] 142 142 static extern void PlaylistPause (InstanceHandle self, 143 143 NativeException ex); … … 149 149 } 150 150 151 [DllImport ("libvlc -control.dll",151 [DllImport ("libvlc.dll", 152 152 EntryPoint="libvlc_playlist_isplaying")] 153 153 static extern int PlaylistIsPlaying (InstanceHandle self, … … 164 164 } 165 165 166 [DllImport ("libvlc -control.dll", EntryPoint="libvlc_playlist_stop")]166 [DllImport ("libvlc.dll", EntryPoint="libvlc_playlist_stop")] 167 167 static extern void PlaylistStop (InstanceHandle self, 168 168 NativeException ex); … … 174 174 } 175 175 176 [DllImport ("libvlc -control.dll", EntryPoint="libvlc_playlist_next")]176 [DllImport ("libvlc.dll", EntryPoint="libvlc_playlist_next")] 177 177 static extern void PlaylistNext (InstanceHandle self, 178 178 NativeException ex); … … 184 184 } 185 185 186 [DllImport ("libvlc -control.dll", EntryPoint="libvlc_playlist_prev")]186 [DllImport ("libvlc.dll", EntryPoint="libvlc_playlist_prev")] 187 187 static extern void PlaylistPrev (InstanceHandle self, 188 188 NativeException ex); … … 194 194 } 195 195 196 [DllImport ("libvlc -control.dll", EntryPoint="libvlc_playlist_clear")]196 [DllImport ("libvlc.dll", EntryPoint="libvlc_playlist_clear")] 197 197 static extern void PlaylistClear (InstanceHandle self, 198 198 NativeException ex); … … 208 208 } 209 209 210 [DllImport ("libvlc -control.dll",210 [DllImport ("libvlc.dll", 211 211 EntryPoint="libvlc_playlist_add_extended")] 212 212 static extern int PlaylistAdd (InstanceHandle self, U8String uri, … … 265 265 } 266 266 267 [DllImport ("libvlc -control.dll",267 [DllImport ("libvlc.dll", 268 268 EntryPoint="libvlc_playlist_delete_item")] 269 269 static extern int PlaylistDelete (InstanceHandle self, int id, … … 321 321 } 322 322 323 [DllImport ("libvlc -control.dll",323 [DllImport ("libvlc.dll", 324 324 EntryPoint="libvlc_media_new")] 325 325 public static extern … … 327 327 NativeException ex); 328 328 329 [DllImport ("libvlc -control.dll",329 [DllImport ("libvlc.dll", 330 330 EntryPoint="libvlc_media_release")] 331 331 public static extern void Release (IntPtr ptr); bindings/cil/tests/testvlc.cs
ra2aa6ae r84d0f81 1 1 /* 2 * testvlc.cs - tests for libvlc -controlCIL bindings2 * testvlc.cs - tests for libvlc CIL bindings 3 3 * 4 4 * $Id$ bindings/java/core/src/main/java/org/videolan/jvlc/internal/LibVlc.java
r88ff21f r84d0f81 39 39 { 40 40 41 LibVlc INSTANCE = (LibVlc) Native.loadLibrary("vlc -control", LibVlc.class);41 LibVlc INSTANCE = (LibVlc) Native.loadLibrary("vlc", LibVlc.class); 42 42 43 43 LibVlc SYNC_INSTANCE = (LibVlc) Native.synchronizedLibrary(INSTANCE); bindings/python/setup.py
r03dbdfe r84d0f81 72 72 vlcconfig=get_vlcconfig() 73 73 if vlcconfig is None: 74 return [ '-lvlc -control' ]74 return [ '-lvlc' ] 75 75 else: 76 76 ldflags = [] … … 82 82 ldflags.append('-lstdc++') 83 83 if not libtool: 84 # vlc-config is broken and gives a -lvlc -controlwhich84 # vlc-config is broken and gives a -lvlc which 85 85 # does not exist if libtool is disabled. 86 ldflags.remove('-lvlc -control')86 ldflags.remove('-lvlc') 87 87 return ldflags 88 88
