##// END OF EJS Templates
Added missing threading protections
Jeandet Alexis -
r69:039eabb0d39f default
parent child
Show More
@@ -1029,7 +1029,6 bool stardundeeSPW_USB_Manager::sendPack
1029
1029
1030 SocExplorerEngine::message(this->plugin,"Packet sent",2);
1030 SocExplorerEngine::message(this->plugin,"Packet sent",2);
1031 }
1031 }
1032 // this->handleMutex->unlock();
1033 return true;
1032 return true;
1034 }
1033 }
1035
1034
@@ -1045,6 +1044,7 void stardundeeSPW_USB_Manager::pushRmap
1045
1044
1046 void stardundeeSPW_USB_Manager::sendTimecodePeriodically( bool onOff )
1045 void stardundeeSPW_USB_Manager::sendTimecodePeriodically( bool onOff )
1047 {
1046 {
1047 this->handleMutex->lock();
1048 if (onOff == true)
1048 if (onOff == true)
1049 {
1049 {
1050 if (!USBSpaceWire_TC_EnableAutoTickIn(hDevice, 1, 1))
1050 if (!USBSpaceWire_TC_EnableAutoTickIn(hDevice, 1, 1))
@@ -1055,6 +1055,7 void stardundeeSPW_USB_Manager::sendTime
1055 if (!USBSpaceWire_TC_EnableAutoTickIn(hDevice, 0, 0))
1055 if (!USBSpaceWire_TC_EnableAutoTickIn(hDevice, 0, 0))
1056 SocExplorerEngine::message(this->plugin,"Could not disable auto tick-in");
1056 SocExplorerEngine::message(this->plugin,"Could not disable auto tick-in");
1057 }
1057 }
1058 this->handleMutex->unlock();
1058 }
1059 }
1059
1060
1060 int stardundeeSPW_USB_Manager::getLinkNumber( void )
1061 int stardundeeSPW_USB_Manager::getLinkNumber( void )
@@ -1069,6 +1070,7 void stardundeeSPW_USB_Manager::setTimec
1069 double freqCountInDouble=0.0;
1070 double freqCountInDouble=0.0;
1070 double currentFrequency=0.0;
1071 double currentFrequency=0.0;
1071
1072
1073 this->handleMutex->lock();
1072 rtr_clk_freq = USBSpaceWire_TC_GetClockFrequency(hDevice);
1074 rtr_clk_freq = USBSpaceWire_TC_GetClockFrequency(hDevice);
1073 freqCountInDouble = ((double) rtr_clk_freq) / requestedFrequency;
1075 freqCountInDouble = ((double) rtr_clk_freq) / requestedFrequency;
1074 freqCount = (unsigned int) freqCountInDouble;
1076 freqCount = (unsigned int) freqCountInDouble;
@@ -1082,10 +1084,12 void stardundeeSPW_USB_Manager::setTimec
1082 else
1084 else
1083 SocExplorerEngine::message(this->plugin,"tick frequency set to " + QString::number(currentFrequency) +" Hz"
1085 SocExplorerEngine::message(this->plugin,"tick frequency set to " + QString::number(currentFrequency) +" Hz"
1084 + " (freqCount set to " + QString::number(freqCount) + ")" );
1086 + " (freqCount set to " + QString::number(freqCount) + ")" );
1087 this->handleMutex->unlock();
1085 }
1088 }
1086
1089
1087 void stardundeeSPW_USB_Manager::sendOneTimecode( unsigned char nTimein )
1090 void stardundeeSPW_USB_Manager::sendOneTimecode( unsigned char nTimein )
1088 {
1091 {
1092 this->handleMutex->lock();
1089 // enable external timecode selection
1093 // enable external timecode selection
1090 if(!USBSpaceWire_TC_EnableExternalTimecodeSelection(hDevice,1))
1094 if(!USBSpaceWire_TC_EnableExternalTimecodeSelection(hDevice,1))
1091 SocExplorerEngine::message(this->plugin,"sendOneTimecode *** ERR *** enable external timecode selection");
1095 SocExplorerEngine::message(this->plugin,"sendOneTimecode *** ERR *** enable external timecode selection");
@@ -1098,6 +1102,7 void stardundeeSPW_USB_Manager::sendOneT
1098 // disable external timecode selection
1102 // disable external timecode selection
1099 if(!USBSpaceWire_TC_EnableExternalTimecodeSelection(hDevice,0))
1103 if(!USBSpaceWire_TC_EnableExternalTimecodeSelection(hDevice,0))
1100 SocExplorerEngine::message(this->plugin,"sendOneTimecode *** ERR *** disable external timecode selection");
1104 SocExplorerEngine::message(this->plugin,"sendOneTimecode *** ERR *** disable external timecode selection");
1105 this->handleMutex->unlock();
1101 }
1106 }
1102
1107
1103
1108
General Comments 0
You need to be logged in to leave comments. Login now