Permalink
Browse files

libremix : Fix a bunch of compiler warnings.

git-svn-id: http://svn.metadecks.org/libremix/trunk@401 e2d53364-18fc-0310-981e-b60a84739af0
  • Loading branch information...
1 parent 1b6c950 commit f6419517a0f258518897ce42ca64f4a40db120ff erikd committed Jul 15, 2006
View
@@ -40,7 +40,7 @@
#define MIN(a,b) ((a)<(b)?(a):(b))
#define MAX(a,b) ((a)>(b)?(a):(b))
-typedef enum _CDScalarType CDScalarType;
+typedef int CDScalarType;
typedef union _CDScalar CDScalar;
typedef struct _CDSet CDSet;
typedef struct _CDList CDList;
@@ -43,9 +43,9 @@ main (int argc, char ** argv)
{
CDList * list, * list2;
void * ctx;
- int a=1, b=2, c=3, d=4, e=5, f=6, g=7, h=8, i=9, j=10, k=11, l=12;
- int m=13, n=14, o=15, p=16, q=17, r=18, s=19, t=20, u=21, v=22, w=23;
- int x=24, y=25, z=26;
+ int a=1, b=2, d=4, f=6, g=7, k=11;
+ int v=22, w=23;
+ int z=26;
ctx = NULL;
@@ -145,7 +145,7 @@ remix_init (void)
remix_channelset_defaults_initialise (env);
ctx->channels = REMIX_MONO;
- remix_plugin_initialise_defaults (env);
+ remix_plugin_defaults_initialise (env);
return env;
}
@@ -120,7 +120,7 @@ remix_plugin_initialise_dynamic (RemixEnv * env)
}
void
-remix_plugin_initialise_defaults (RemixEnv * env)
+remix_plugin_defaults_initialise (RemixEnv * env)
{
CDList * plugins = cd_list_new (env);
@@ -359,7 +359,7 @@ RemixCount remix_channel_mix (RemixEnv * env, RemixChannel * src,
/* remix_channelset */
-void remix_channelset_initialise_defaults (RemixEnv * env);
+void remix_channelset_defaults_initialise (RemixEnv * env);
void remix_channelset_defaults_destroy (RemixEnv * env);
/* remix_chunk */
View
@@ -31,6 +31,7 @@ non_existant_file (void)
RemixPlugin * sf_plugin;
CDSet * sf_parms;
int sf_path_key;
+ CDScalar name;
INFO ("Attempting to read non existant file") ;
@@ -41,8 +42,8 @@ non_existant_file (void)
sf_plugin = remix_find_plugin (env, "builtin::sndfile_reader");
sf_parms = cd_set_new (env);
sf_path_key = remix_get_init_parameter_key (env, sf_plugin, "path");
- sf_parms = cd_set_insert (env, sf_parms, sf_path_key,
- CD_STRING("bad_file_name.wav"));
+ name.s_string = "bad_file_name.wav" ;
+ sf_parms = cd_set_insert (env, sf_parms, sf_path_key, name);
if (sf_plugin == NULL) {
FAIL ("Newly created sndfile plugin NULL");
}

0 comments on commit f641951

Please sign in to comment.