← Back to branch summary

~ubuntu-branches/ubuntu/karmic/pulseaudio/karmic-updates

« back to all changes in this revision

Viewing changes to src/pulsecore/protocol-native.c

  • Committer: Bazaar Package Importer
  • Author(s): Luke Yelavich, Daniel T Chen, Luke Yelavich
  • Date: 2009-09-11 09:24:39 UTC
  • mfrom: (1.14.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20090911092439-7dixbvy6r30alrv8
Tags: 1:0.9.16-0ubuntu1
https://launchpad.net/bugs/426210
[ Daniel T Chen ]
* debian/patches/0090-use-volume-ignore-for-analog-output.patch:
  + Realign volume control behaviour with existing Ubuntu releases,
    i.e., disable volume = merge and use volume = ignore for
    analog output

[ Luke Yelavich ]
* New upstream release
* debian/patches/0057-introspect-version-fixes.patch (LP: #426210),
  debian/patches/0056-alsa-rework.patch,
  debian/patches/0055-llvm-clang-analyzer-fixes.patch,
  0054-volume-libpulse-backported-fixes.patch,
  0053-add-input-sources.patch,
  debian/patches/0052-disable-cpu-limit.patch: Dropped, all applied upstream
* debian/patches/0051-reduce-lib-linking.patch: Drop, since we are not going
  to be doing bi-arch pulseaudio packages for karmic

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/pulsecore/protocol-native.c
628
628
 
629
629
    record_stream *s;
630
630
    pa_source_output *source_output = NULL;
631
 
    size_t base;
632
631
    pa_source_output_new_data data;
633
632
 
634
633
    pa_assert(c);
682
681
            0,
683
682
            s->buffer_attr.maxlength,
684
683
            0,
685
 
            base = pa_frame_size(&source_output->sample_spec),
 
684
            pa_frame_size(&source_output->sample_spec),
686
685
            1,
687
686
            0,
688
687
            0,
827
826
            pa_pstream_send_simple_ack(s->connection->pstream, PA_PTR_TO_UINT(userdata));
828
827
            break;
829
828
 
830
 
        case PLAYBACK_STREAM_MESSAGE_UPDATE_TLENGTH: {
831
 
            pa_tagstruct *t;
 
829
        case PLAYBACK_STREAM_MESSAGE_UPDATE_TLENGTH:
832
830
 
833
831
            s->buffer_attr.tlength = (uint32_t) offset;
834
832
 
835
 
            t = pa_tagstruct_new(NULL, 0);
836
 
            pa_tagstruct_putu32(t, PA_COMMAND_PLAYBACK_BUFFER_ATTR_CHANGED);
837
 
            pa_tagstruct_putu32(t, (uint32_t) -1); /* tag */
838
 
            pa_tagstruct_putu32(t, s->index);
839
 
            pa_tagstruct_putu32(t, s->buffer_attr.maxlength);
840
 
            pa_tagstruct_putu32(t, s->buffer_attr.tlength);
841
 
            pa_tagstruct_putu32(t, s->buffer_attr.prebuf);
842
 
            pa_tagstruct_putu32(t, s->buffer_attr.minreq);
843
 
            pa_tagstruct_put_usec(t, s->configured_sink_latency);
844
 
            pa_pstream_send_tagstruct(s->connection->pstream, t);
 
833
            if (s->connection->version >= 15) {
 
834
                pa_tagstruct *t;
 
835
 
 
836
                t = pa_tagstruct_new(NULL, 0);
 
837
                pa_tagstruct_putu32(t, PA_COMMAND_PLAYBACK_BUFFER_ATTR_CHANGED);
 
838
                pa_tagstruct_putu32(t, (uint32_t) -1); /* tag */
 
839
                pa_tagstruct_putu32(t, s->index);
 
840
                pa_tagstruct_putu32(t, s->buffer_attr.maxlength);
 
841
                pa_tagstruct_putu32(t, s->buffer_attr.tlength);
 
842
                pa_tagstruct_putu32(t, s->buffer_attr.prebuf);
 
843
                pa_tagstruct_putu32(t, s->buffer_attr.minreq);
 
844
                pa_tagstruct_put_usec(t, s->configured_sink_latency);
 
845
                pa_pstream_send_tagstruct(s->connection->pstream, t);
 
846
            }
845
847
 
846
848
            break;
847
 
        }
848
849
    }
849
850
 
850
851
    return 0;
2274
2275
    ret = pa_core_exit(c->protocol->core, FALSE, 0);
2275
2276
    CHECK_VALIDITY(c->pstream, ret >= 0, tag, PA_ERR_ACCESS);
2276
2277
 
 
2278
    pa_log_debug("Client %s asks us to terminate.", pa_strnull(pa_proplist_gets(c->client->proplist, PA_PROP_APPLICATION_PROCESS_BINARY)));
 
2279
 
2277
2280
    pa_pstream_send_simple_ack(c->pstream, tag); /* nonsense */
2278
2281
}
2279
2282