← Back to branch summary

~ubuntu-branches/ubuntu/trusty/freerdp/trusty-proposed

« back to all changes in this revision

Viewing changes to include/freerdp/settings.h

  • Committer: Package Import Robot
  • Author(s): Michael Terry
  • Date: 2012-11-16 23:08:42 UTC
  • mfrom: (9.1.5 sid)
  • Revision ID: package-import@ubuntu.com-20121116230842-mnisn295dk1b0nzi
Tags: 1.0.1-2ubuntu1
* Merge from Debian unstable.  Remaining changes:
  - debian/control, debian/rules: Drop avcodec/ffmpeg support
  - debian/patches/remote-control.diff: Fix crash in Remote Control
  - debian/patches/cherry-48ad5feb0a6ad831d863f89ed74b443021e54303.patch:
    Fix freerdp extension handling problem.
  - debian/patches/backport-from-stdin.patch: Add --from-stdin
  - debian/patches/allow-null-domain.patch: Allow null domains from stdin
* debian/patches/cherry-pick-8293c5b4cb072038fe2bdc15207ee6de4e291879:
  - Dropped, included in Debian

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/freerdp/settings.h
311
311
        boolean console_audio; /* 160 */
312
312
        boolean console_session; /* 161 */
313
313
        uint32 redirected_session_id; /* 162 */
314
 
        uint32 paddingG[176 - 163]; /* 163 */
 
314
        boolean audio_playback; /* 163 */
 
315
        boolean audio_capture; /* 164 */
 
316
        uint32 paddingG[176 - 165]; /* 165 */
315
317
 
316
318
        /* Output Control */
317
319
        boolean refresh_rect; /* 176 */