projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
auto keyframe color prefs, colorpicker rework, ru.po update, keyframe align fixes...
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
device1394input.C
diff --git
a/cinelerra-5.1/cinelerra/device1394input.C
b/cinelerra-5.1/cinelerra/device1394input.C
index 57d4e468ea35e0697b685c23f42592591b1daeab..337bdb29b10dbc2280154e53da20634ae08c0c4f 100644
(file)
--- a/
cinelerra-5.1/cinelerra/device1394input.C
+++ b/
cinelerra-5.1/cinelerra/device1394input.C
@@
-19,6
+19,8
@@
*
*/
+#ifdef HAVE_FIREWIRE
+
#include "condition.h"
#include "device1394input.h"
#include "ieee1394-ioctl.h"
@@
-67,8
+69,8
@@
Device1394Input::~Device1394Input()
{
done = 1;
Thread::cancel();
- Thread::join();
}
+ Thread::join();
if(buffer)
{
@@
-370,7
+372,4
@@
int Device1394Input::read_audio(char *data, int samples)
return result;
}
-
-
-
-
+#endif