projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changed .gitignore to not ignore Makefile so build still works
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
plugins
/
livevideo
/
livevideo.C
diff --git
a/cinelerra-5.1/plugins/livevideo/livevideo.C
b/cinelerra-5.1/plugins/livevideo/livevideo.C
index 1aa84222d2c8963b40a30e619d26bb4eb958c310..888164a1a4ae52e6e519c4022a6f064bd65236bd 100644
(file)
--- a/
cinelerra-5.1/plugins/livevideo/livevideo.C
+++ b/
cinelerra-5.1/plugins/livevideo/livevideo.C
@@
-31,7
+31,9
@@
#include "filexml.h"
#include "guicast.h"
#include "language.h"
#include "filexml.h"
#include "guicast.h"
#include "language.h"
+#ifdef HAVE_DV
#include "libdv.h"
#include "libdv.h"
+#endif
#include "libmjpeg.h"
#include "mwindow.h"
#include "picture.h"
#include "libmjpeg.h"
#include "mwindow.h"
#include "picture.h"
@@
-150,7
+152,9
@@
public:
int prev_channel;
int w, h;
// Decompressors for different video drivers
int prev_channel;
int w, h;
// Decompressors for different video drivers
+#ifdef HAVE_DV
dv_t *dv;
dv_t *dv;
+#endif
mjpeg_t *mjpeg;
};
mjpeg_t *mjpeg;
};
@@
-350,7
+354,9
@@
LiveVideo::LiveVideo(PluginServer *server)
w = xS(320);
h = yS(640);
prev_channel = 0;
w = xS(320);
h = yS(640);
prev_channel = 0;
+#ifdef HAVE_DV
dv = 0;
dv = 0;
+#endif
mjpeg = 0;
picture = 0;
this->server = server;
mjpeg = 0;
picture = 0;
this->server = server;
@@
-370,7
+376,9
@@
LiveVideo::~LiveVideo()
delete channeldb;
delete temp;
delete channeldb;
delete temp;
+#ifdef HAVE_DV
if(dv) dv_delete(dv);
if(dv) dv_delete(dv);
+#endif
if(mjpeg) mjpeg_delete(mjpeg);
delete picture;
}
if(mjpeg) mjpeg_delete(mjpeg);
delete picture;
}
@@
-499,6
+507,7
@@
int LiveVideo::process_buffer(VFrame *frame,
{
switch(session->vconfig_in->driver)
{
{
switch(session->vconfig_in->driver)
{
+#ifdef HAVE_DV
case CAPTURE_FIREWIRE:
case CAPTURE_IEC61883:
// Decompress a DV frame from the driver
case CAPTURE_FIREWIRE:
case CAPTURE_IEC61883:
// Decompress a DV frame from the driver
@@
-511,7
+520,7
@@
int LiveVideo::process_buffer(VFrame *frame,
frame->get_color_model());
frame->set_opengl_state(VFrame::RAM);
break;
frame->get_color_model());
frame->set_opengl_state(VFrame::RAM);
break;
-
+#endif
case VIDEO4LINUX2JPEG:
if(!mjpeg)
mjpeg = mjpeg_new(frame->get_w(),
case VIDEO4LINUX2JPEG:
if(!mjpeg)
mjpeg = mjpeg_new(frame->get_w(),
@@
-639,8
+648,3
@@
void LiveVideo::update_gui()
}
}
}
}
}
}
-
-
-
-
-