From 7ac340473d9a7e0253ab5f4eb89db198bdc9acb3 Mon Sep 17 00:00:00 2001 From: Douglas Araujo Date: Fri, 13 Sep 2024 12:01:49 +0200 Subject: [PATCH] Remove disconnect method once that it was only returning true always --- ADOrcaApp/src/orca.cpp | 16 ---------------- ADOrcaApp/src/orca.h | 1 - 2 files changed, 17 deletions(-) diff --git a/ADOrcaApp/src/orca.cpp b/ADOrcaApp/src/orca.cpp index 480775a..91b2f77 100644 --- a/ADOrcaApp/src/orca.cpp +++ b/ADOrcaApp/src/orca.cpp @@ -1837,8 +1837,6 @@ int Orca::connectCamera(void) { static const char* functionName = "connectCamera"; int nDevices = 0; int iDevice = 0; - /* disconnect any connected camera first */ - disconnectCamera(); /* initialize api */ memset(&m_apiInit, 0, sizeof(m_apiInit)); @@ -1883,20 +1881,6 @@ int Orca::connectCamera(void) { return 0; } -//============================================================================ -int Orca::disconnectCamera(void) { - int status = 0; - - if (m_hdcam == NULL) { - return status; - } - - dcamdev_close(m_hdcam); - - m_hdcam = NULL; - return status; -} -//============================================================================ int Orca::allocateBuffers(unsigned int nBuffers) { m_err = dcambuf_alloc(m_hdcam, nBuffers); if (failed(m_err)) { diff --git a/ADOrcaApp/src/orca.h b/ADOrcaApp/src/orca.h index a53f4c1..830ae50 100644 --- a/ADOrcaApp/src/orca.h +++ b/ADOrcaApp/src/orca.h @@ -356,7 +356,6 @@ class epicsShareClass Orca : public ADDriver { // These function will be read only once int connectCamera(); - int disconnectCamera(); int initCamera(); // helper functions for dcamapi