1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
--- smurf-0.52.6/src/sfload.c.old 2006-11-05 21:42:20.000000000 +0100
+++ smurf-0.52.6/src/sfload.c 2006-11-05 21:42:36.000000000 +0100
@@ -705,7 +705,7 @@
{ /* inst is last gen */
level = 3;
READW (genval.uword, fd);
- GPOINTER_TO_INT (((SFZone *) (p2->data))->instsamp) =
+ (((SFZone *) (p2->data))->instsamp) =
genval.uword + 1;
break; /* break out of generator loop */
}
@@ -1055,7 +1055,7 @@
{ /* sample is last gen */
level = 3;
READW (genval.uword, fd);
- GPOINTER_TO_INT (((SFZone *) (p2->data))->instsamp) =
+ (((SFZone *) (p2->data))->instsamp) =
genval.uword + 1;
break; /* break out of generator loop */
}
--- smurf-0.52.6/src/sfsave.c.old 2006-11-05 21:43:15.000000000 +0100
+++ smurf-0.52.6/src/sfsave.c 2006-11-05 21:44:51.000000000 +0100
@@ -620,9 +620,9 @@
z = (SFZone *) (p2->data);
if (z->instsamp)
{
- (guint16) dummy = Gen_Instrument;
+ dummy = Gen_Instrument;
WRITEW ((guint16) dummy, fd);
- (guint16) dummy = g_slist_position (sf->inst, z->instsamp);
+ dummy = g_slist_position (sf->inst, z->instsamp);
WRITEW ((guint16) dummy, fd);
*size += SFGENSIZE;
}
@@ -780,9 +780,9 @@
z = (SFZone *) (p2->data);
if (z->instsamp)
{
- (guint16) dummy = Gen_SampleId;
+ dummy = Gen_SampleId;
WRITEW ((guint16) dummy, fd);
- (guint16) dummy = g_slist_position (sf->sample, z->instsamp);
+ dummy = g_slist_position (sf->sample, z->instsamp);
WRITEW ((guint16) dummy, fd);
*size += SFGENSIZE;
}
|