niansa-misc/wine
1
0
Fork 0
mirror of synced 2025-03-07 03:53:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

dmusic: Parse instrument regions articulation lists.

Browse source
This commit is contained in:
Rémi Bernon 2023-09-15 09:02:57 +02:00 • committed by Alexandre Julliard
parent d32fb707ad
commit a788bf9641
1 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
dlls/dmusic/instrument.c
View file

@ -36,6 +36,7 @@ C_ASSERT(sizeof(struct articulation) == offsetof(struct articulation, connection
struct region struct region
{ {
struct list entry; struct list entry;
struct list articulations;
RGNHEADER header; RGNHEADER header;
WAVELINK wave_link; WAVELINK wave_link;
WSMPL wave_sample; WSMPL wave_sample;
@ -121,6 +122,13 @@ static ULONG WINAPI instrument_Release(LPDIRECTMUSICINSTRUMENT iface)
LIST_FOR_EACH_ENTRY_SAFE(region, next_region, &This->regions, struct region, entry) LIST_FOR_EACH_ENTRY_SAFE(region, next_region, &This->regions, struct region, entry)
{ {
LIST_FOR_EACH_ENTRY_SAFE(articulation, next_articulation, &region->articulations,
struct articulation, entry)
{
list_remove(&articulation->entry);
free(articulation);
}
list_remove(&region->entry); list_remove(&region->entry);
free(region); free(region);
} }
@ -221,7 +229,8 @@ static HRESULT instrument_create(struct collection *collection, IDirectMusicInst
return S_OK; return S_OK;
} }
static HRESULT parse_art1_chunk(struct instrument *This, IStream *stream, struct chunk_entry *chunk) static HRESULT parse_art1_chunk(struct instrument *This, IStream *stream, struct chunk_entry *chunk,
struct list *articulations)
{ {
struct articulation *articulation; struct articulation *articulation;
CONNECTIONLIST list; CONNECTIONLIST list;
@ -239,12 +248,13 @@ static HRESULT parse_art1_chunk(struct instrument *This, IStream *stream, struct
size = sizeof(CONNECTION) * list.cConnections; size = sizeof(CONNECTION) * list.cConnections;
if (FAILED(hr = stream_read(stream, articulation->connections, size))) free(articulation); if (FAILED(hr = stream_read(stream, articulation->connections, size))) free(articulation);
else list_add_tail(&This->articulations, &articulation->entry); else list_add_tail(articulations, &articulation->entry);
return hr; return hr;
} }
static HRESULT parse_lart_list(struct instrument *This, IStream *stream, struct chunk_entry *parent) static HRESULT parse_lart_list(struct instrument *This, IStream *stream, struct chunk_entry *parent,
struct list *articulations)
{ {
struct chunk_entry chunk = {.parent = parent}; struct chunk_entry chunk = {.parent = parent};
HRESULT hr; HRESULT hr;
@ -254,7 +264,7 @@ static HRESULT parse_lart_list(struct instrument *This, IStream *stream, struct
switch (MAKE_IDTYPE(chunk.id, chunk.type)) switch (MAKE_IDTYPE(chunk.id, chunk.type))
{ {
case FOURCC_ART1: case FOURCC_ART1:
hr = parse_art1_chunk(This, stream, &chunk); hr = parse_art1_chunk(This, stream, &chunk, articulations);
break; break;
default: default:
@ -275,6 +285,7 @@ static HRESULT parse_rgn_chunk(struct instrument *This, IStream *stream, struct
HRESULT hr; HRESULT hr;
if (!(region = malloc(sizeof(*region)))) return E_OUTOFMEMORY; if (!(region = malloc(sizeof(*region)))) return E_OUTOFMEMORY;
list_init(&region->articulations);
while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) while ((hr = stream_next_chunk(stream, &chunk)) == S_OK)
{ {
@ -299,6 +310,10 @@ static HRESULT parse_rgn_chunk(struct instrument *This, IStream *stream, struct
hr = stream_chunk_get_data(stream, &chunk, &region->wave_link, sizeof(region->wave_link)); hr = stream_chunk_get_data(stream, &chunk, &region->wave_link, sizeof(region->wave_link));
break; break;
case MAKE_IDTYPE(FOURCC_LIST, FOURCC_LART):
hr = parse_lart_list(This, stream, &chunk, &region->articulations);
break;
default: default:
FIXME("Ignoring chunk %s %s\n", debugstr_fourcc(chunk.id), debugstr_fourcc(chunk.type)); FIXME("Ignoring chunk %s %s\n", debugstr_fourcc(chunk.id), debugstr_fourcc(chunk.type));
break; break;
@ -365,7 +380,7 @@ static HRESULT parse_ins_chunk(struct instrument *This, IStream *stream, struct
break; break;
case MAKE_IDTYPE(FOURCC_LIST, FOURCC_LART): case MAKE_IDTYPE(FOURCC_LIST, FOURCC_LART):
hr = parse_lart_list(This, stream, &chunk); hr = parse_lart_list(This, stream, &chunk, &This->articulations);
break; break;
default: default: