Mir

Merge lp:~robert-ancell/mir/buffer-stream-prototype into lp:mir

  1. buffer-stream-prototype
  2. Merge into development-branch
Proposed by Robert Ancell on 2015-05-26
Status: Merged
Approved by: Andreas Pokorny on 2015-05-27
Approved revision: 2600
Merged at revision: 2599
Proposed branch: lp:~robert-ancell/mir/buffer-stream-prototype
Merge into: lp:mir
Diff against target: 17 lines (+2/-2)
1 file modified
include/client/mir_toolkit/client_types.h (+2/-2)
To merge this branch: bzr merge lp:~robert-ancell/mir/buffer-stream-prototype
Reviewer Review Type Date Requested Status
Andreas Pokorny (community) 2015-05-26 Approve on 2015-05-27
PS Jenkins bot continuous-integration Approve on 2015-05-27
Kevin DuBois (community) Approve on 2015-05-26
Alan Griffiths Needs Fixing on 2015-05-26
Review via email: mp+260094@code.launchpad.net

Commit Message

Fix name of variable of type MirBufferStream from surface to stream.

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:2599
http://jenkins.qa.ubuntu.com/job/mir-ci/3897/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/2575
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/86
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/2523
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/53
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/53/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2523
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2523/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5392
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20732

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/3897/rebuild

review: Approve (continuous-integration)
Andreas Pokorny (andreas-pokorny) wrote :

while at it, please also update the documentation in line 78. then feel free to TA.

review: Needs Fixing
Alan Griffiths (alan-griffiths) wrote :

> while at it, please also update the documentation in line 78. then feel free
> to TA.

+1

review: Needs Fixing
Kevin DuBois (kdub) :
review: Approve
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/1478/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/2582
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/93
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/2530/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-autolanding/33
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-autolanding/33/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2530
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2530/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5398/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20756

review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:2600
http://jenkins.qa.ubuntu.com/job/mir-ci/3906/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/2585
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/96
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/2533
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/62
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/62/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2533
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2533/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5400
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20759

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/3906/rebuild

review: Approve (continuous-integration)
Andreas Pokorny (andreas-pokorny) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'include/client/mir_toolkit/client_types.h'
2--- include/client/mir_toolkit/client_types.h 2015-03-31 02:35:42 +0000
3+++ include/client/mir_toolkit/client_types.h 2015-05-26 22:59:22 +0000
4@@ -75,11 +75,11 @@
5 /**
6 * Callback to be passed when calling:
7 * - mir_buffer_stream_* functions requiring a callback.
8- * \param [in] surface the buffer stream being updated
9+ * \param [in] stream the buffer stream being updated
10 * \param [in,out] client_context context provided by client in calling
11 * mir_connect
12 */
13-typedef void (*mir_buffer_stream_callback)(MirBufferStream *surface, void *client_context);
14+typedef void (*mir_buffer_stream_callback)(MirBufferStream *stream, void *client_context);
15
16 /**
17 * Callback for handling of surface events.

Subscribers

People subscribed via source and target branches