← Back to branch summary

~ubuntu-branches/ubuntu/vivid/zoneminder/vivid-proposed

« back to all changes in this revision

Viewing changes to src/zm_local_camera.h

  • Committer: Bazaar Package Importer
  • Author(s): Peter Howard
  • Date: 2009-11-14 15:02:10 UTC
  • mfrom: (4.1.4 sid)
  • Revision ID: james.westby@ubuntu.com-20091114150210-d8721h9wm90cbaog
Tags: 1.24.2-2
http://bugs.debian.org/551746
http://bugs.debian.org/553092
http://bugs.debian.org/531717
* Remove custom perl parth from zmpkg.pl, fix location of manpages.
(closes: #551746, #553092)
* Fix GCC4.4 bug
(closes: #531717)
* Fix potential bug in postinst script

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/zm_local_camera.h
1
1
//
2
 
// ZoneMinder Local Camera Class Interface, $Date: 2009-02-18 12:30:43 +0000 (Wed, 18 Feb 2009) $, $Revision: 2777 $
 
2
// ZoneMinder Local Camera Class Interface, $Date: 2009-03-31 13:57:34 +0100 (Tue, 31 Mar 2009) $, $Revision: 2827 $
3
3
// Copyright (C) 2001-2008 Philip Coombes
4
4
// 
5
5
// This program is free software; you can redistribute it and/or
20
20
#ifndef ZM_LOCAL_CAMERA_H
21
21
#define ZM_LOCAL_CAMERA_H
22
22
 
23
 
#include <sys/types.h>
24
 
#include <sys/ioctl.h>
25
 
 
26
 
#include <string.h>
27
 
 
28
 
#include <string>
29
 
 
30
23
#include "zm.h"
31
24
#include "zm_camera.h"
 
25
 
32
26
#include "zm_ffmpeg.h"
33
27
 
34
28
#ifdef HAVE_LINUX_VIDEODEV2_H
136
130
        int Capture( Image &image );
137
131
        int PostCapture();
138
132
 
139
 
        static bool GetCurrentSettings( const char *device, char *output, bool verbose );
 
133
        static bool GetCurrentSettings( const char *device, char *output, int version, bool verbose );
140
134
};
141
135
 
142
136
#endif // ZM_LOCAL_CAMERA_H