[patch] Patch to make cinelerra build

cinelerra-20101104-remove-support-v4l-buzz-k2-6-38.diff (text/plain), 5.28 KB, created by James on 2011-04-05 21:57:31 UTC

diff -crB cinelerra/channelpicker.C cinelerra/channelpicker.C
*** cinelerra/channelpicker.C	2010-11-03 18:54:58.000000000 -0500
--- cinelerra/channelpicker.C	2011-04-05 16:37:01.671630624 -0500
***************
*** 39,45 ****
  #include "recordgui.h"
  #include "recordmonitor.h"
  #include "theme.h"
! #include "vdevicebuz.h"
  #include "vdeviceprefs.h"
  #include "videodevice.h"
  
--- 39,45 ----
  #include "recordgui.h"
  #include "recordmonitor.h"
  #include "theme.h"
! //#include "vdevicebuz.h"
  #include "vdeviceprefs.h"
  #include "videodevice.h"
  
***************
*** 280,286 ****
  //	printf("PrefsChannelPicker::PrefsChannelPicker 1\n");
  	this->mwindow = mwindow;
  	this->prefs = prefs;
! 	VDeviceBUZ::get_inputs(&input_sources);
  }
  
  PrefsChannelPicker::~PrefsChannelPicker()
--- 280,286 ----
  //	printf("PrefsChannelPicker::PrefsChannelPicker 1\n");
  	this->mwindow = mwindow;
  	this->prefs = prefs;
! //	VDeviceBUZ::get_inputs(&input_sources);
  }
  
  PrefsChannelPicker::~PrefsChannelPicker()
diff -crB cinelerra/Makefile.am cinelerra/Makefile.am
*** cinelerra/Makefile.am	2010-11-03 18:54:58.000000000 -0500
--- cinelerra/Makefile.am	2011-04-05 16:37:28.481924946 -0500
***************
*** 305,314 ****
  		    vattachmentpoint.C \
  		    vautomation.C \
  		    vdevicebase.C \
- 		    vdevicebuz.C \
  		    vdevicedvb.C \
  		    vdeviceprefs.C \
- 		    vdevicev4l.C \
  		    vdevicev4l2.C \
  		    vdevicev4l2jpeg.C \
  		    vdevicex11.C \
--- 305,312 ----
***************
*** 630,640 ****
  		 vautomation.h \
  		 vdevice1394.h \
  		 vdevicebase.h \
- 		 vdevicebuz.h \
  		 vdevicedvb.h \
  		 vdevicelml.h \
  		 vdeviceprefs.h \
- 		 vdevicev4l.h \
  		 vdevicev4l2.h \
  		 vdevicev4l2jpeg.h \
  		 vdevicex11.h \
--- 628,636 ----
diff -crB cinelerra/reversemake cinelerra/reversemake
*** cinelerra/reversemake	2010-11-03 18:54:58.000000000 -0500
--- cinelerra/reversemake	2011-04-05 16:37:01.672630598 -0500
***************
*** 32,41 ****
  make $OBJDIR/vedits.o
  make $OBJDIR/vedit.o
  make $OBJDIR/vdevicex11.o
- make $OBJDIR/vdevicev4l.o
  make $OBJDIR/vdeviceprefs.o
  make $OBJDIR/vdevicelml.o
- make $OBJDIR/vdevicebuz.o
  make $OBJDIR/vdevicebase.o
  make $OBJDIR/vdevice1394.o
  make $OBJDIR/vautomation.o
--- 32,39 ----
Only in old//cinelerra-20101104/cinelerra: vdevicebuz.C
Only in old//cinelerra-20101104/cinelerra: vdevicebuz.h
Only in old//cinelerra-20101104/cinelerra: vdevicebuz.inc
Only in old//cinelerra-20101104/cinelerra: vdevicev4l.C
Only in old//cinelerra-20101104/cinelerra: vdevicev4l.h
Only in old//cinelerra-20101104/cinelerra: vdevicev4l.inc
diff -crB cinelerra/videodevice.C cinelerra/videodevice.C
*** cinelerra/videodevice.C	2010-11-03 18:54:58.000000000 -0500
--- cinelerra/videodevice.C	2011-04-05 16:37:01.675630518 -0500
***************
*** 39,47 ****
  #ifdef HAVE_FIREWIRE
  #include "vdevice1394.h"
  #endif
! #include "vdevicebuz.h"
  #include "vdevicedvb.h"
! #include "vdevicev4l.h"
  #include "vdevicev4l2.h"
  #include "vdevicev4l2jpeg.h"
  #include "vdevicex11.h"
--- 39,47 ----
  #ifdef HAVE_FIREWIRE
  #include "vdevice1394.h"
  #endif
! //#include "vdevicebuz.h"
  #include "vdevicedvb.h"
! //#include "vdevicev4l.h"
  #include "vdevicev4l2.h"
  #include "vdevicev4l2jpeg.h"
  #include "vdevicex11.h"
***************
*** 250,257 ****
  {
  	switch(in_config->driver)
  	{
! 		case VIDEO4LINUX:
! 			return input_base = new VDeviceV4L(this);
  
  #ifdef HAVE_VIDEO4LINUX2
  		case VIDEO4LINUX2:
--- 249,256 ----
  {
  	switch(in_config->driver)
  	{
! 		//case VIDEO4LINUX:
! 		//	return input_base = new VDeviceV4L(this);
  
  #ifdef HAVE_VIDEO4LINUX2
  		case VIDEO4LINUX2:
***************
*** 264,271 ****
  		case SCREENCAPTURE:
  			return input_base = new VDeviceX11(this, 0);
  
! 		case CAPTURE_BUZ:
! 			return input_base = new VDeviceBUZ(this);
  
  #ifdef HAVE_FIREWIRE
  		case CAPTURE_FIREWIRE:
--- 263,270 ----
  		case SCREENCAPTURE:
  			return input_base = new VDeviceX11(this, 0);
  
! 		//case CAPTURE_BUZ:
! 		//	return input_base = new VDeviceBUZ(this);
  
  #ifdef HAVE_FIREWIRE
  		case CAPTURE_FIREWIRE:
***************
*** 662,670 ****
  //printf("VideoDevice::open_output 1 %d\n", out_config->driver);
  	switch(out_config->driver)
  	{
! 		case PLAYBACK_BUZ:
! 			output_base = new VDeviceBUZ(this);
! 			break;
  		case PLAYBACK_X11:
  		case PLAYBACK_X11_XV:
  		case PLAYBACK_X11_GL:
--- 661,669 ----
  //printf("VideoDevice::open_output 1 %d\n", out_config->driver);
  	switch(out_config->driver)
  	{
! 		//case PLAYBACK_BUZ:
! 		//	output_base = new VDeviceBUZ(this);
! 		//	break;
  		case PLAYBACK_X11:
  		case PLAYBACK_X11_XV:
  		case PLAYBACK_X11_GL:
diff -crB cinelerra/videodevice.h cinelerra/videodevice.h
*** cinelerra/videodevice.h	2010-11-03 18:54:58.000000000 -0500
--- cinelerra/videodevice.h	2011-04-05 16:37:01.676630492 -0500
***************
*** 40,48 ****
  #include "thread.h"
  #include "picture.inc"
  #include "vdevicebase.inc"
! #include "vdevicebuz.inc"
  #include "vdevicelml.inc"
! #include "vdevicev4l.inc"
  #include "vdevicex11.inc"
  #include "videoconfig.inc"
  #include "videowindow.inc"
--- 40,48 ----
  #include "thread.h"
  #include "picture.inc"
  #include "vdevicebase.inc"
! //#include "vdevicebuz.inc"
  #include "vdevicelml.inc"
! //#include "vdevicev4l.inc"
  #include "vdevicex11.inc"
  #include "videoconfig.inc"
  #include "videowindow.inc"