summaryrefslogtreecommitdiff
path: root/src/decoder.cc
diff options
context:
space:
mode:
authordeva <deva>2005-07-28 16:31:18 +0000
committerdeva <deva>2005-07-28 16:31:18 +0000
commit84e9873f846478476487d5cd2587e5879a0be8ea (patch)
tree4873d2a87c07714ebd8653b5b09981355633572f /src/decoder.cc
parent9111e70794105f984df5b66bba81adc769bd5001 (diff)
*** empty log message ***
Diffstat (limited to 'src/decoder.cc')
-rw-r--r--src/decoder.cc15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/decoder.cc b/src/decoder.cc
index 0655f61..dea0ae4 100644
--- a/src/decoder.cc
+++ b/src/decoder.cc
@@ -47,8 +47,9 @@
#include <SDL/SDL.h>
-#include "dv1394.h"
#include "dv.h"
+#include "dvfile.h"
+#include "dv1394.h"
#include "decoder.h"
#include "debug.h"
@@ -85,7 +86,7 @@ Decoder::~Decoder()
void Decoder::decode()
{
- frame_stream *stream;
+ frame_stream *dvstream;
bool local_shoot;
int local_freeze;
@@ -96,12 +97,12 @@ void Decoder::decode()
dv1394 dv1394_stream = dv1394(info); // Use default port and channel.
dvfile dvfile_stream = dvfile(info);
- if(dv_stream.connect()) {
+ if(dv1394_stream.connect()) {
// Use the dv1394 stream for input.
- stream = &dv1394_stream;
+ dvstream = &dv1394_stream;
} else {
// Use the fallback dv filereader for input.
- stream = &dvfile_stream;
+ dvstream = &dvfile_stream;
}
while(*running) {
@@ -109,8 +110,8 @@ void Decoder::decode()
SDL_Event user_event;
// Read a dvframe
- ptr = stream->readFrame();
- if(!ptr) return; // No frame read. (Due to firewire error)
+ ptr = dvstream->readFrame();
+ if(!ptr) return; // No frame read. (Due to dv read error)
old_record = local_record;
local_shoot = b_shoot;