Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-16 02:42:05 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed compiling tools in MAME and MESS side (no whatsnew)

Browse Source
This commit is contained in:
Miodrag Milanovic 2011-03-31 13:21:58 +00:00
parent e86777d670
commit 33c28764d1
5 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/emu/imagedev/cassette.c
View File

@ -273,7 +273,7 @@ static DEVICE_IMAGE_LOAD( cassette )
{
/* creating an image */
create_opts = cassette->config->create_opts;
err = cassette_create(device->machine(), (void *) &image, &image_ioprocs, &wavfile_format, create_opts, CASSETTE_FLAG_READWRITE|CASSETTE_FLAG_SAVEONEXIT, &cassette->cassette);
err = cassette_create((void *) &image, &image_ioprocs, &wavfile_format, create_opts, CASSETTE_FLAG_READWRITE|CASSETTE_FLAG_SAVEONEXIT, &cassette->cassette);
if (err)
goto error;
}
@ -285,7 +285,7 @@ static DEVICE_IMAGE_LOAD( cassette )
is_writable = image.is_writable();
cassette_flags = is_writable ? (CASSETTE_FLAG_READWRITE|CASSETTE_FLAG_SAVEONEXIT) : CASSETTE_FLAG_READONLY;
extension = image.filetype();
err = cassette_open_choices(device->machine(),(void *) &image, &image_ioprocs, extension, formats, cassette_flags, &cassette->cassette);
err = cassette_open_choices((void *) &image, &image_ioprocs, extension, formats, cassette_flags, &cassette->cassette);
/* this is kind of a hack */
if (err && is_writable)

15
src/emu/imagedev/cassimg.c
View File

@ -81,7 +81,7 @@ static INT16 interpolate16(INT32 value)
initialization and termination
*********************************************************************/
static cassette_image *cassette_init(running_machine &machine,const struct CassetteFormat *format, void *file, const struct io_procs *procs, int flags)
static cassette_image *cassette_init(const struct CassetteFormat *format, void *file, const struct io_procs *procs, int flags)
{
cassette_image *cassette;
@ -95,7 +95,6 @@ static cassette_image *cassette_init(running_machine &machine,const struct Casse
cassette->io.procs = procs;
cassette->flags = flags;
cassette->pool = pool_alloc_lib(NULL);
cassette->m_machine = &machine;
return cassette;
}
@ -125,7 +124,7 @@ static int good_format(const struct CassetteFormat *format, const char *extensio
casserr_t cassette_open_choices(running_machine &machine,void *file, const struct io_procs *procs, const char *extension,
casserr_t cassette_open_choices(void *file, const struct io_procs *procs, const char *extension,
const struct CassetteFormat *const *formats, int flags, cassette_image **outcassette)
{
casserr_t err;
@ -139,7 +138,7 @@ casserr_t cassette_open_choices(running_machine &machine,void *file, const struc
formats = cassette_default_formats;
/* create the cassette object */
cassette = cassette_init(machine, NULL, file, procs, flags);
cassette = cassette_init(NULL, file, procs, flags);
if (!cassette)
{
err = CASSETTE_ERROR_OUTOFMEMORY;
@ -190,18 +189,18 @@ done:
casserr_t cassette_open(running_machine &machine, void *file, const struct io_procs *procs,
casserr_t cassette_open(void *file, const struct io_procs *procs,
const struct CassetteFormat *format, int flags, cassette_image **outcassette)
{
const struct CassetteFormat *formats[2];
formats[0] = format;
formats[1] = NULL;
return cassette_open_choices(machine, file, procs, NULL, formats, flags, outcassette);
return cassette_open_choices(file, procs, NULL, formats, flags, outcassette);
}
casserr_t cassette_create(running_machine &machine, void *file, const struct io_procs *procs, const struct CassetteFormat *format,
casserr_t cassette_create(void *file, const struct io_procs *procs, const struct CassetteFormat *format,
const struct CassetteOptions *opts, int flags, cassette_image **outcassette)
{
casserr_t err;
@ -221,7 +220,7 @@ casserr_t cassette_create(running_machine &machine, void *file, const struct io_
opts = &default_options;
/* create the cassette object */
cassette = cassette_init(machine, format, file, procs, flags);
cassette = cassette_init(format, file, procs, flags);
if (!cassette)
{
err = CASSETTE_ERROR_OUTOFMEMORY;

10
src/emu/imagedev/cassimg.h
View File

@ -87,8 +87,6 @@ struct CassetteInfo
struct _cassette_image
{
running_machine &machine() const { assert(m_machine != NULL); return *m_machine; }
const struct CassetteFormat *format;
struct io_generic io;
object_pool *pool;
@ -100,8 +98,6 @@ struct _cassette_image
struct sample_block *blocks;
size_t block_count;
size_t sample_count;
running_machine *m_machine;
};
typedef struct _cassette_image cassette_image;
@ -165,11 +161,11 @@ CASSETTE_FORMATLIST_EXTERN(cassette_default_formats);
***************************************************************************/
casserr_t cassette_open(running_machine &machine,void *file, const struct io_procs *procs,
casserr_t cassette_open(void *file, const struct io_procs *procs,
const struct CassetteFormat *format, int flags, cassette_image **outcassette);
casserr_t cassette_open_choices(running_machine &machine,void *file, const struct io_procs *procs, const char *extension,
casserr_t cassette_open_choices(void *file, const struct io_procs *procs, const char *extension,
const struct CassetteFormat *const *formats, int flags, cassette_image **outcassette);
casserr_t cassette_create(running_machine &machine,void *file, const struct io_procs *procs, const struct CassetteFormat *format,
casserr_t cassette_create(void *file, const struct io_procs *procs, const struct CassetteFormat *format,
const struct CassetteOptions *opts, int flags, cassette_image **outcassette);
casserr_t cassette_save(cassette_image *cassette);
void cassette_close(cassette_image *cassette);

1
src/osd/windows/ledutil.c
View File

@ -73,6 +73,7 @@
#include <string.h>
// MAME output header file
typedef int running_machine;
#include "osdcomm.h"
#include "output.h"

6
src/osd/windows/output.h
View File

@ -117,6 +117,12 @@ struct _copydata_id_string
char string[1]; // string array containing the data
};
//============================================================
// FUNCTION PROTOTYPES
//============================================================
void winoutput_init(running_machine &machine);