Merge remote-tracking branch 'refs/remotes/origin/master' into MemoryFile_Open

# Conflicts:
#	libvlc/MemoryFile.rbbas

Author: charonn0

App.rbbas

@@ -1,6 +1,20 @@
 #tag Class
 Protected Class App
 Inherits Application
+	#tag Event
+		Sub Open()
+		  Dim bs As BinaryStream = BinaryStream.Open(GetFolderItem("D:\Music\Soundtracks\Elder Scrolls\Skyrim\Disk 1\The Elder Scrolls V- Skyrim - Night without Stars.flac"))
+		  Dim m As New libvlc.Medium(bs)
+		  Dim p As New VLCPlayer(m)
+		  If Not p.Play() Then Break
+		  Do Until Not p.IsPlaying
+		    DoEvents
+		  Loop
+		  Quit
+		End Sub
+	#tag EndEvent
+
+
 	#tag Constant, Name = kEditClear, Type = String, Dynamic = False, Default = \"&Delete", Scope = Public
 		#Tag Instance, Platform = Windows, Language = Default, Definition  = \"&Delete"
 		#Tag Instance, Platform = Linux, Language = Default, Definition  = \"&Delete"

libvlc/MemoryFile.rbbas

@@ -20,7 +20,10 @@ Private Class MemoryFile
 		  End If
 
 		  If Streams = Nil Then Streams = New Dictionary
-		  Dim opaque As Ptr = NewOpaque()
+		  Static Opaque As Integer
+		  Do
+		    Opaque = Opaque + 1
+		  Loop Until Not Streams.HasKey(Opaque)
 		  Streams.Value(opaque) = Stream
 		  mHandle = libvlc_media_new_callbacks(Owner.Instance, Nil, AddressOf MediaRead, AddressOf MediaSeek, AddressOf MediaClose, opaque)
 		End Sub
@@ -33,7 +36,7 @@ Private Class MemoryFile
 	#tag EndMethod
 
 	#tag Method, Flags = &h21
-		Private Shared Sub MediaClose(Opaque As Ptr)
+		Private Shared Sub MediaClose(Opaque As Integer)
 		  #pragma X86CallingConvention CDecl
 		  #pragma BoundsChecking Off
 		  #pragma BackgroundTasks Off
@@ -46,14 +49,14 @@ Private Class MemoryFile
 	#tag EndMethod
 
 	#tag Method, Flags = &h21
-		Private Shared Function MediaOpen(Opaque As Ptr, Buffer As Ptr, ByRef BufferSize As UInt64) As UInt32
+		Private Shared Function MediaOpen(Opaque As Integer, Buffer As Ptr, ByRef BufferSize As UInt64) As UInt32
 		  #pragma X86CallingConvention CDecl
 		  #pragma BoundsChecking Off
 		  #pragma BackgroundTasks Off
 		  #pragma StackOverflowChecking Off
 		  #pragma NilObjectChecking Off
 
-		  System.DebugLog(CurrentMethodName + "(0x" + Hex(Integer(Opaque)) + ", " + Hex(Integer(Buffer)) + ", " + Format(BufferSize, "+-##########0") + ")")
+		  System.DebugLog(CurrentMethodName + "(0x" + Hex(Opaque) + ", " + Hex(Integer(Buffer)) + ", " + Format(BufferSize, "+-##########0") + ")")
 
 		  Dim mb As MemoryBlock = Streams.Lookup(Opaque, Nil)
 		  If mb = Nil Then Return 1 ' invalid Opaque
@@ -67,14 +70,14 @@ Private Class MemoryFile
 	#tag EndMethod
 
 	#tag Method, Flags = &h21
-		Private Shared Function MediaRead(Opaque As Ptr, Buffer As Ptr, BufferSize As Integer) As UInt32
+		Private Shared Function MediaRead(Opaque As Integer, Buffer As Ptr, BufferSize As Integer) As UInt32
 		  #pragma X86CallingConvention CDecl
 		  #pragma BoundsChecking Off
 		  #pragma BackgroundTasks Off
 		  #pragma StackOverflowChecking Off
 		  #pragma NilObjectChecking Off
 
-		  System.DebugLog(CurrentMethodName + "(0x" + Hex(Integer(Opaque)) + ", " + Hex(Integer(Buffer)) + ", " + Format(BufferSize, "+-##########0") + ")")
+		  System.DebugLog(CurrentMethodName + "(0x" + Hex(Opaque) + ", " + Hex(Integer(Buffer)) + ", " + Format(BufferSize, "+-##########0") + ")")
 
 		  Dim r As Readable = Streams.Lookup(Opaque, Nil)
 		  If r = Nil Then Return 0 ' invalid Opaque
@@ -88,7 +91,7 @@ Private Class MemoryFile
 	#tag EndMethod
 
 	#tag Method, Flags = &h21
-		Private Shared Function MediaSeek(Opaque As Ptr, Offset As UInt64) As Int32
+		Private Shared Function MediaSeek(Opaque As Integer, Offset As UInt64) As Int32
 		  #pragma X86CallingConvention CDecl
 		  #pragma BoundsChecking Off
 		  #pragma BackgroundTasks Off
@@ -105,16 +108,6 @@ Private Class MemoryFile
 		End Function
 	#tag EndMethod
 
-	#tag Method, Flags = &h21
-		Private Shared Function NewOpaque() As Ptr
-		  Static Opaque As Integer
-		  Do
-		    opaque = opaque + 1
-		  Loop Until Not Streams.HasKey(Ptr(opaque))
-		  Return Ptr(opaque)
-		End Function
-	#tag EndMethod
-
 
 	#tag Property, Flags = &h21
 		Private mHandle As Ptr

libvlc/libvlc.rbbas

@@ -354,7 +354,7 @@ Protected Module libvlc
 	#tag EndExternalMethod
 
 	#tag ExternalMethod, Flags = &h21
-		Private Soft Declare Function libvlc_media_new_callbacks Lib VLCLib (Instance As Ptr, OpenCB As Ptr, ReadCB As Ptr, SeekCB As Ptr, CloseCB As Ptr, Opaque As Ptr) As Ptr
+		Private Soft Declare Function libvlc_media_new_callbacks Lib VLCLib (Instance As Ptr, OpenCB As Ptr, ReadCB As Ptr, SeekCB As Ptr, CloseCB As Ptr, Opaque As Integer) As Ptr
 	#tag EndExternalMethod
 
 	#tag ExternalMethod, Flags = &h21