summaryrefslogtreecommitdiffhomepage
path: root/FaceTrackNoIR/FaceTrackNoIR.cpp
diff options
context:
space:
mode:
authorWim Vriend <facetracknoir@gmail.com>2012-09-28 13:40:18 +0000
committerWim Vriend <facetracknoir@gmail.com>2012-09-28 13:40:18 +0000
commit75360443eb879b49a72c11b2a3d2d299ca61f9d7 (patch)
treefdab3ff501710e19f31f63815957a1fe86dbcb88 /FaceTrackNoIR/FaceTrackNoIR.cpp
parentee53c49af9789553fb51987bd6003ce30344e173 (diff)
Modified sendHeadposeToGame, so it also sends raw data.
Unified the code by adding the Dll class to the protocols and moving the dialog to a separate source. git-svn-id: svn+ssh://svn.code.sf.net/p/facetracknoir/code@173 19e81ba0-9b1a-49c3-bd6c-561e1906d5fb
Diffstat (limited to 'FaceTrackNoIR/FaceTrackNoIR.cpp')
-rw-r--r--FaceTrackNoIR/FaceTrackNoIR.cpp23
1 files changed, 8 insertions, 15 deletions
diff --git a/FaceTrackNoIR/FaceTrackNoIR.cpp b/FaceTrackNoIR/FaceTrackNoIR.cpp
index 00e3a87c..340b80d5 100644
--- a/FaceTrackNoIR/FaceTrackNoIR.cpp
+++ b/FaceTrackNoIR/FaceTrackNoIR.cpp
@@ -1143,11 +1143,12 @@ void FaceTrackNoIR::exit() {
//
void FaceTrackNoIR::createIconGroupBox()
{
-importGetProtocolDialog getProtocol;
+importGetProtocolDll getProtocol;
+IProtocolDllPtr pProtocolDll; // Pointer to Protocol info instance (in DLL)
importGetFilterDll getFilter;
IFilterDllPtr pFilterDll; // Pointer to Filter info instance (in DLL)
importGetTrackerDll getTracker;
-ITrackerDll *pTrackerDll; // Pointer to Filter info instance (in DLL)
+ITrackerDll *pTrackerDll; // Pointer to Tracker info instance (in DLL)
QSettings settings("Abbequerque Inc.", "FaceTrackNoIR"); // Registry settings (in HK_USER)
@@ -1173,27 +1174,19 @@ ITrackerDll *pTrackerDll; // Pointer to Filter info instance (in DLL)
// qDebug() << "createIconGroupBox says: ProtocolName = " << protocolFileList.at(i);
- //
- // Delete the existing QDialog
- //
- if (pProtocolDialog) {
- delete pProtocolDialog;
- pProtocolDialog = NULL;
- }
-
// Show the appropriate Protocol-server Settings
QLibrary *protocolLib = new QLibrary(protocolFileList.at(i));
QString *protocolName = new QString("");
QIcon *protocolIcon = new QIcon();
- getProtocol = (importGetProtocolDialog) protocolLib->resolve("GetProtocolDialog");
+ getProtocol = (importGetProtocolDll) protocolLib->resolve("GetProtocolDll");
if (getProtocol) {
- IProtocolDialogPtr ptrXyz(getProtocol());
+ IProtocolDllPtr ptrXyz(getProtocol());
if (ptrXyz)
{
- pProtocolDialog = ptrXyz;
- pProtocolDialog->getFullName( protocolName );
- pProtocolDialog->getIcon( protocolIcon );
+ pProtocolDll = ptrXyz;
+ pProtocolDll->getFullName( protocolName );
+ pProtocolDll->getIcon( protocolIcon );
// qDebug() << "FaceTrackNoIR::showServerControls GetProtocolDialog Function Resolved!";
}
else {