* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <stdlib.h>
#include <vlc/vlc.h>
-#include <vlc/input.h>
#include "input_internal.h"
};
static int Read ( stream_t *, void *p_read, int i_read );
-static int Peek ( stream_t *, uint8_t **pp_peek, int i_read );
+static int Peek ( stream_t *, const uint8_t **pp_peek, int i_read );
static int Control( stream_t *, int i_query, va_list );
static void Delete ( stream_t * );
stream_t *__stream_MemoryNew( vlc_object_t *p_this, uint8_t *p_buffer,
int64_t i_size, vlc_bool_t i_preserve_memory )
{
- stream_t *s = vlc_object_create( p_this, VLC_OBJECT_STREAM );
+ stream_t *s = vlc_stream_create( p_this );
stream_sys_t *p_sys;
if( !s ) return NULL;
p_sys->p_buffer = p_buffer;
p_sys->i_preserve_memory = i_preserve_memory;
- s->pf_block = NULL;
s->pf_read = Read;
s->pf_peek = Peek;
s->pf_control = Control;
case STREAM_SET_POSITION:
i_64 = (int64_t)va_arg( args, int64_t );
i_64 = __MAX( i_64, 0 );
- i_64 = __MIN( i_64, s->p_sys->i_size );
+ i_64 = __MIN( i_64, s->p_sys->i_size );
p_sys->i_pos = i_64;
break;
return i_res;
}
-static int Peek( stream_t *s, uint8_t **pp_peek, int i_read )
+static int Peek( stream_t *s, const uint8_t **pp_peek, int i_read )
{
stream_sys_t *p_sys = s->p_sys;
int i_res = __MIN( i_read, p_sys->i_size - p_sys->i_pos );