← Back to branch summary

~ubuntu-branches/ubuntu/quantal/gst-plugins-bad0.10/quantal-proposed

« back to all changes in this revision

Viewing changes to gst/camerabin/gstcamerabin.h

  • Committer: Bazaar Package Importer
  • Author(s): Ken VanDine
  • Date: 2011-07-19 14:32:43 UTC
  • mfrom: (18.4.21 sid)
  • Revision ID: james.westby@ubuntu.com-20110719143243-p7pnkh45akfp0ihk
Tags: 0.10.22-2ubuntu1
* Rebased on debian unstable, remaining changes:
  - debian/gstreamer-plugins-bad.install
    * don't include dtmf, liveadder, rtpmux, autoconvert and shm, we include 
      them in -good

Show diffs side-by-side

added added

removed removed

Lines of Context:
gst/camerabin/gstcamerabin.h
31
31
#include "gstcamerabin-enum.h"
32
32
#include "camerabinimage.h"
33
33
#include "camerabinvideo.h"
 
34
#include "camerabinpreview.h"
34
35
 
35
36
G_BEGIN_DECLS
36
37
/* #defines don't like whitespacey bits */
147
148
  GstElement *imgbin;           /* bin that holds image capturing elements */
148
149
  GstElement *vidbin;           /*  bin that holds video capturing elements */
149
150
  GstElement *active_bin;       /* image or video bin that is currently in use */
150
 
  GstElement *preview_pipeline; /* pipeline for creating preview images */
151
 
  GstElement *video_preview_pipeline;   /* pipeline for creating video preview image */
 
151
  /* pipeline for creating preview images */
 
152
  GstCameraBinPreviewPipelineData *preview_pipeline;
 
153
  /* pipeline for creating video preview image */
 
154
  GstCameraBinPreviewPipelineData *video_preview_pipeline;
152
155
 
153
156
  GstBuffer *video_preview_buffer;      /* buffer for storing video preview */
154
157