Commit ead2ee06 authored by sletz's avatar sletz
Browse files

Cleanup for compilation with gcc 4.3

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3257 0c269be4-1314-0410-8aa9-9f06e86f4224
parent 56821dbf
......@@ -56,23 +56,18 @@ void ExternalMetro::shutdown (void* arg)
printf("shutdown called..\n");
}
ExternalMetro::ExternalMetro(int freq, double max_amp, int dur_arg, int bpm, char* client_name)
ExternalMetro::ExternalMetro(int freq, double max_amp, int dur_arg, int bpm, const char* client_name)
{
sample_t scale;
int i, attack_length, decay_length;
double *amp;
int attack_percent = 1, decay_percent = 10;
char *bpm_string = "bpm";
const char *bpm_string = "bpm";
jack_options_t options = JackNullOption;
jack_status_t status;
jack_status_t status;
offset = 0;
/* Initial Jack setup, get sample rate */
if (!client_name) {
client_name = (char *) malloc (9 * sizeof (char));
strcpy (client_name, "metro");
}
if ((client = jack_client_open (client_name, options, &status)) == 0) {
fprintf (stderr, "jack server not running?\n");
throw -1;
......
......@@ -55,7 +55,7 @@ extern "C"
sample_t *wave;
long offset ;
ExternalMetro(int freq, double max_amp, int dur_arg, int bpm, char* client_name);
ExternalMetro(int freq, double max_amp, int dur_arg, int bpm, const char* client_name = "metro");
virtual ~ExternalMetro();
static int process_audio (jack_nframes_t nframes, void* arg);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment