diff options
| author | Colin Guthrie <pulse@colin.guthr.ie> | 2008-08-22 10:56:45 +0100 |
|---|---|---|
| committer | Colin Guthrie <pulse@colin.guthr.ie> | 2008-08-22 10:56:45 +0100 |
| commit | 4282b726ee57ebae846ce400fd1cae43c4dfb2ae (patch) | |
| tree | 2cb32c3bc52a9b9eab50a6195f3ccb190332f7d8 /src/modules/module-jack-source.c | |
| parent | bf17dbb101d509e885bf689f4f13f75e4b3ab58d (diff) | |
| parent | dc9b8dce309728b47059b9b44fd3bbd3798667ae (diff) | |
Merge branch 'master' of git://git.0pointer.de/pulseaudio
Diffstat (limited to 'src/modules/module-jack-source.c')
| -rw-r--r-- | src/modules/module-jack-source.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/module-jack-source.c b/src/modules/module-jack-source.c index 03f9d15c..9eccbbfa 100644 --- a/src/modules/module-jack-source.c +++ b/src/modules/module-jack-source.c @@ -116,7 +116,7 @@ static int source_process_msg(pa_msgobject *o, int code, void *data, int64_t off if (u->source->thread_info.state == PA_SOURCE_RUNNING) pa_source_post(u->source, chunk); - u->saved_frame_time = offset; + u->saved_frame_time = (jack_nframes_t) offset; u->saved_frame_time_valid = TRUE; return 0; @@ -309,7 +309,7 @@ int pa__init(pa_module*m) { pa_log_info("Successfully connected as '%s'", jack_get_client_name(u->client)); - ss.channels = u->channels = channels; + u->channels = ss.channels = (uint8_t) channels; ss.rate = jack_get_sample_rate(u->client); ss.format = PA_SAMPLE_FLOAT32NE; |