Split miav server and client apart. Port client to Qt4. Replace libraw1994 with libiec61883. Add unit tests for multiplexer and fix some bugs in it.

1 files changed, 4 insertions, 5 deletions

diff --git a/src/dv1394.h b/src/dv1394.h
index 7cea9d0..f2361c5 100644
--- a/src/dv1394.h
+++ b/src/dv1394.h
@@ -24,14 +24,11 @@
  *    along with MIaV; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
  */
-#include "config.h"
 #ifndef __MIAV_DV1394_H__
 #define __MIAV_DV1394_H__
 
-#ifdef USE_GUI
-
 #include "frame_stream.h"
-#include <libraw1394/raw1394.h>
+#include <libiec61883/iec61883.h>
 
 #include "info.h"
 
@@ -44,12 +41,14 @@ public:
 
   unsigned char *readFrame();
 
+  unsigned char *ptr;
+
 private:
   raw1394handle_t handle;
+  iec61883_dv_fb_t frame;
   Info *info;
   int port;
   int channel;
 };
 
 #endif/*__MIAV_DV1394_H__*/
-#endif/*USE_GUI*/