mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 12:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

common: integrate chd into interface stream

Browse Source
This commit is contained in:
Brian Koropoff 2017-09-16 22:30:21 -07:00
parent 2c7b6a94e4
commit a5dc63b390
2 changed files with 77 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libretro-common/include/streams/interface_stream.h
View File

@ -32,15 +32,16 @@
RETRO_BEGIN_DECLS
typedef struct _chd_file chd_file;
enum intfstream_type
{
INTFSTREAM_FILE = 0,
INTFSTREAM_MEMORY
INTFSTREAM_MEMORY,
INTFSTREAM_CHD
};
typedef struct intfstream_internal intfstream_internal_t;
typedef struct intfstream intfstream_t;
typedef struct intfstream_internal intfstream_internal_t, intfstream_t;
typedef struct intfstream_info
{
@ -53,6 +54,11 @@ typedef struct intfstream_info
} buf;
bool writable;
} memory;
struct
{
chd_file *handle;
int32_t track;
} chd;
enum intfstream_type type;
} intfstream_info_t;

70
libretro-common/streams/interface_stream.c
View File

@ -25,6 +25,7 @@
#include <streams/interface_stream.h>
#include <streams/file_stream.h>
#include <streams/memory_stream.h>
#include <streams/chd_stream.h>
struct intfstream_internal
{
@ -45,6 +46,11 @@ struct intfstream_internal
memstream_t *fp;
bool writable;
} memory;
struct
{
int32_t track;
chdstream_t *fp;
} chd;
};
bool intfstream_resize(intfstream_internal_t *intf, intfstream_info_t *info)
@ -63,6 +69,10 @@ bool intfstream_resize(intfstream_internal_t *intf, intfstream_info_t *info)
memstream_set_buffer(intf->memory.buf.data,
intf->memory.buf.size);
break;
#ifdef HAVE_CHD
case INTFSTREAM_CHD:
break;
#endif
}
return true;
@ -86,6 +96,15 @@ bool intfstream_open(intfstream_internal_t *intf, const char *path,
if (!intf->memory.fp)
return false;
break;
case INTFSTREAM_CHD:
#ifdef HAVE_CHD
intf->chd.fp = chdstream_open(path, intf->chd.track);
if (!intf->chd.fp)
return false;
#else
return false;
#endif
break;
}
return true;
@ -103,6 +122,11 @@ int intfstream_close(intfstream_internal_t *intf)
case INTFSTREAM_MEMORY:
memstream_close(intf->memory.fp);
return 0;
#ifdef HAVE_CHD
case INTFSTREAM_CHD:
chdstream_close(intf->chd.fp);
return 0;
#endif
}
return -1;
@ -130,6 +154,13 @@ void *intfstream_init(intfstream_info_t *info)
if (!intfstream_resize(intf, info))
goto error;
break;
case INTFSTREAM_CHD:
#ifdef HAVE_CHD
intf->chd.track = info->chd.track;
break;
#else
goto error;
#endif
}
return intf;
@ -151,6 +182,10 @@ int intfstream_seek(intfstream_internal_t *intf, int offset, int whence)
return (int)filestream_seek(intf->file.fp, (int)offset, whence);
case INTFSTREAM_MEMORY:
return (int)memstream_seek(intf->memory.fp, offset, whence);
#ifdef HAVE_CHD
case INTFSTREAM_CHD:
return (int)chdstream_seek(intf->chd.fp, offset, whence);
#endif
}
return -1;
@ -167,9 +202,13 @@ ssize_t intfstream_read(intfstream_internal_t *intf, void *s, size_t len)
return filestream_read(intf->file.fp, s, len);
case INTFSTREAM_MEMORY:
return memstream_read(intf->memory.fp, s, len);
#ifdef HAVE_CHD
case INTFSTREAM_CHD:
return chdstream_read(intf->chd.fp, s, len);
#endif
}
return 0;
return -1;
}
ssize_t intfstream_write(intfstream_internal_t *intf,
@ -184,6 +223,8 @@ ssize_t intfstream_write(intfstream_internal_t *intf,
return filestream_write(intf->file.fp, s, len);
case INTFSTREAM_MEMORY:
return memstream_write(intf->memory.fp, s, len);
case INTFSTREAM_CHD:
return -1;
}
return 0;
@ -201,6 +242,10 @@ char *intfstream_gets(intfstream_internal_t *intf,
return filestream_gets(intf->file.fp, buffer, len);
case INTFSTREAM_MEMORY:
return memstream_gets(intf->memory.fp, buffer, len);
#ifdef HAVE_CHD
case INTFSTREAM_CHD:
return chdstream_gets(intf->chd.fp, buffer, len);
#endif
}
return NULL;
@ -209,7 +254,7 @@ char *intfstream_gets(intfstream_internal_t *intf,
int intfstream_getc(intfstream_internal_t *intf)
{
if (!intf)
return 0;
return -1;
switch (intf->type)
{
@ -217,9 +262,15 @@ int intfstream_getc(intfstream_internal_t *intf)
return filestream_getc(intf->file.fp);
case INTFSTREAM_MEMORY:
return memstream_getc(intf->memory.fp);
case INTFSTREAM_CHD:
#ifdef HAVE_CHD
return chdstream_getc(intf->chd.fp);
#else
return -1;
#endif
}
return 0;
return -1;
}
int intfstream_tell(intfstream_internal_t *intf)
@ -233,6 +284,12 @@ int intfstream_tell(intfstream_internal_t *intf)
return (int)filestream_tell(intf->file.fp);
case INTFSTREAM_MEMORY:
return (int)memstream_pos(intf->memory.fp);
case INTFSTREAM_CHD:
#ifdef HAVE_CHD
return (int)chdstream_tell(intf->chd.fp);
#else
return -1;
#endif
}
return -1;
@ -248,6 +305,11 @@ void intfstream_rewind(intfstream_internal_t *intf)
case INTFSTREAM_MEMORY:
memstream_rewind(intf->memory.fp);
break;
case INTFSTREAM_CHD:
#ifdef HAVE_CHD
chdstream_rewind(intf->chd.fp);
#endif
break;
}
}
@ -264,5 +326,7 @@ void intfstream_putc(intfstream_internal_t *intf, int c)
case INTFSTREAM_MEMORY:
memstream_putc(intf->memory.fp, c);
break;
case INTFSTREAM_CHD:
break;
}
}