Merge CV, ver=5.1; ops/methods from HV, and interface from CV where possible

[goodguy/history.git] / cinelerra-5.0 / cinelerra / vdevicev4l2jpeg.h

diff --git a/cinelerra-5.0/cinelerra/vdevicev4l2jpeg.h b/cinelerra-5.0/cinelerra/vdevicev4l2jpeg.h
deleted file mode 100644 (file)
index 8fa18b3..0000000
--- a/cinelerra-5.0/cinelerra/vdevicev4l2jpeg.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-/*
- * CINELERRA
- * Copyright (C) 2008 Adam Williams <broadcast at earthling dot net>
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * 
- */
-
-#ifndef VDEVICEV4L2JPEG_H
-#define VDEVICEV4L2JPEG_H
-
-#include "../hvirtual_config.h"
-
-#ifdef HAVE_VIDEO4LINUX2
-#include "devicev4l2base.h"
-#include "vdevicebase.h"
-#include <linux/types.h>
-#include <linux/videodev2.h>
-#include "videodevice.inc"
-#include "vdevicev4l2jpeg.inc"
-#include "vdevicev4l2.inc"
-
-
-
-class VDeviceV4L2JPEG : public VDeviceBase, public DeviceV4L2Base
-{
-public:
-       VDeviceV4L2JPEG(VideoDevice *device);
-       ~VDeviceV4L2JPEG();
-       VideoDevice *v4l2_device() { return device; }
-
-       int close_all();
-       int open_input();
-       int get_best_colormodel(Asset *asset);
-       int read_buffer(VFrame *frame);
-       int has_signal();
-};
-
-#endif
-#endif
-
-