Ticket #1530: fwfix.diff

libs/libmythtv/firewirechannel.cpp

@@ -125 +125 @@
     return true;
 }
 
-bool FirewireChannel::Open(void)
+bool FirewireChannel::OpenFirewire(void)
 {
     if (!is_supported(fw_opts.model))
     {

libs/libmythtv/firewirerecorder.cpp

@@ -178 +178 @@
     raw1394_destroy_handle(fwhandle);
 }
 
-void FirewireRecorder::grab_frames()
+bool FirewireRecorder::grab_frames()
 {
     struct timeval tv;
     fd_set rfds;

libs/libmythtv/firewirechannel.h

@@ -35 +35 @@
         { return QString("%1:%2").arg(fw_opts.port).arg(fw_opts.node); }
 
   private:
-    bool OpenFirewire();
-    void CloseFirewire();
-
-  private:
     FireWireDBOptions  fw_opts;
     nodeid_t           fwnode;
     raw1394handle_t    fwhandle;