aboutsummaryrefslogtreecommitdiff
path: root/multimedia/kino/files/patch-src__ieee1394io.h
blob: e98b0cdbd40ed561202554a961c45abd7bc2cdd1 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
--- src/ieee1394io.h.orig	Sun May 21 19:14:23 2006
+++ src/ieee1394io.h	Tue Jul 18 22:56:29 2006
@@ -20,8 +20,10 @@
 #ifndef _IEEE1394IO_H
 #define _IEEE1394IO_H 1
 
+#if 0
 #include <libraw1394/raw1394.h>
 #include <libraw1394/csr.h>
+#endif
 #ifdef HAVE_IEC61883
 #include <libiec61883/iec61883.h>
 #endif
@@ -29,6 +31,7 @@
 #include "dv1394.h"
 #endif
 
+#include <pthread.h>
 #include <string>
 using std::string;
 #include <deque>
@@ -114,7 +117,7 @@
 {
 private:
 	/// the handle to libraw1394
-	raw1394handle_t m_handle;
+	// raw1394handle_t m_handle;
 
 	/// the handle to libiec61883
 	iec61883_dv_fb_t m_iec61883dv;
@@ -130,7 +133,7 @@
 	void StopReceive( void );
 	bool StartThread( int port );
 	void StopThread( void );
-	int Handler( int length, int complete, unsigned char *data );
+	// int Handler( int length, int complete, unsigned char *data );
 	void *Thread();
 	void ResetHandler( void );
 
@@ -183,7 +186,7 @@
 	pthread_mutex_t avc_mutex;
 
 	/// the handle to the ieee1394 subsystem
-	raw1394handle_t avc_handle;
+	//raw1394handle_t avc_handle;
 
 public:
 	AVC( void );
@@ -211,7 +214,7 @@
 	}
 
 private:
-	static int ResetHandler( raw1394handle_t handle, unsigned int generation );
+	//static int ResetHandler( raw1394handle_t handle, unsigned int generation );
 
 };