Index: /trunk/freebob/src/avdevice.h
===================================================================
--- /trunk/freebob/src/avdevice.h (revision 57)
+++ /trunk/freebob/src/avdevice.h (revision 58)
@@ -93,5 +93,4 @@
  private:
     int m_iNodeId;
-    raw1394handle_t m_handle;
     int m_iPort;
     bool m_bInitialised;
Index: /trunk/freebob/src/avdevice.cpp
===================================================================
--- /trunk/freebob/src/avdevice.cpp (revision 57)
+++ /trunk/freebob/src/avdevice.cpp (revision 58)
@@ -33,5 +33,4 @@
 AvDevice::AvDevice(octlet_t oGuid)
     : m_iNodeId( -1 )
-    , m_handle( 0 )
     , m_iPort( -1 )
     , m_bInitialised( false )
@@ -56,9 +55,4 @@
     for( it = cSubUnits.begin(); it != cSubUnits.end(); it++ ) {
 	delete *it;
-    }
-
-    if ( m_handle ) {
-	raw1394_destroy_handle( m_handle );
-	m_handle = 0;
     }
     AvDevicePool::instance()->unregisterAvDevice( this );
@@ -97,11 +91,5 @@
 {
     if ( !m_bInitialised ) {
-	FBReturnCodes eStatus = create1394RawHandle();
-	if ( eStatus != eFBRC_Success ) {
-	    debugError( "Could not create 1394 raw handle\n" );
-	    return eStatus;
-	}
-
-	eStatus = enumerateSubUnits();
+	FBReturnCodes eStatus = enumerateSubUnits();
 	if ( eStatus != eFBRC_Success ) {
 	    debugError( "Could not enumrate SubUnits\n" );
@@ -117,28 +105,4 @@
 {
     return m_bInitialised;
-}
-
-FBReturnCodes AvDevice::create1394RawHandle()
-{
-    m_handle = raw1394_new_handle();
-    if ( !m_handle ) {
-	if ( !errno ) {
-	    debugPrint( DEBUG_LEVEL_DEVICE,
-			"libraw1394 not compatible.\n" );
-	} else {
-	    perror( "Could not get 1394 handle" );
-	    debugPrint(DEBUG_LEVEL_DEVICE,
-		       "Is ieee1394 and raw1394 driver loaded?\n");
-	}
-	return eFBRC_Creating1394HandleFailed;
-    }
-
-    raw1394_set_userdata( m_handle, this );
-
-    if ( raw1394_set_port( m_handle,  m_iPort ) < 0 ) {
-	perror( "Could not set port" );
-	return eFBRC_Setting1394PortFailed;
-    }
-    return eFBRC_Success;
 }