Skip to content

Commit c183443

Browse files
eloisebrosseaueloisebrosseau
committed
Clean up code
Signed-off-by: Éloïse Brosseau <[email protected]>
1 parent fac982b commit c183443

File tree

4 files changed

+96
-107
lines changed

4 files changed

+96
-107
lines changed

‎src/plugins/output/AJADevices/AJADevices/AJAModule.h‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ namespace AJADevices
2828
SimpleMode
2929
};
3030

31-
AJAModule( NativeDisplayPtr, unsigned int app4CC, OperationMode );
32-
virtual ~AJAModule();
33-
34-
virtual std::string name() const;
35-
virtual std::string SDKIdentifier() const;
36-
virtual std::string SDKInfo() const;
37-
virtual void open();
38-
virtual void close();
39-
virtual bool isOpen() const;
31+
AJAModule( NativeDisplayPtr, unsigned int appID, OperationMode );
32+
~AJAModule() override;
33+
34+
[[nodiscard]] std::string name() const override;
35+
[[nodiscard]] std::string SDKIdentifier() const override;
36+
[[nodiscard]] std::string SDKInfo() const override;
37+
void open() override;
38+
void close() override;
39+
[[nodiscard]] bool isOpen() const override;
4040

4141
private:
4242
OperationMode m_mode{ OperationMode::ProMode };

‎src/plugins/output/AJADevices/AJADevices/KonaVideoDevice.h‎

Lines changed: 80 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -25,29 +25,21 @@
2525
#include <GL/glu.h>
2626
#endif
2727

28-
#if defined( PLATFORM_DARWIN )
29-
#include <TwkGLF/GL.h>
30-
#endif
31-
3228
#include <TwkGLF/GLFBO.h>
3329
#include <TwkGLF/GLFence.h>
3430
#include <iostream>
3531
#include <stl_ext/thread_group.h>
3632
#include "ajatypes.h"
3733
#include "ntv2enums.h"
38-
#include "ntv2devicefeatures.h"
39-
#include "ntv2devicescanner.h"
40-
#include "ntv2utils.h"
4134
#include "ntv2card.h"
42-
#include "ntv2vpid.h"
4335

4436
namespace AJADevices
4537
{
4638
class AJAModule;
4739

48-
typedef boost::mutex::scoped_lock ScopedLock;
49-
typedef boost::mutex Mutex;
50-
typedef boost::condition_variable Condition;
40+
using ScopedLock = boost::mutex::scoped_lock;
41+
using Mutex = boost::mutex;
42+
using Condition = boost::condition_variable;
5143

5244
struct KonaAudioFormat
5345
{
@@ -90,8 +82,8 @@ namespace AJADevices
9082
unsigned int flags{ 0 };
9183
};
9284

93-
typedef std::vector<KonaVideoFormat> KonaVideoFormatVector;
94-
typedef std::vector<KonaDataFormat> KonaDataFormatVector;
85+
using KonaVideoFormatVector = std::vector<KonaVideoFormat>;
86+
using KonaDataFormatVector = std::vector<KonaDataFormat>;
9587

9688
struct KonaSyncMode
9789
{
@@ -188,17 +180,17 @@ namespace AJADevices
188180
// Types
189181
//
190182

191-
typedef TwkUtil::Timer Timer;
192-
typedef TwkGLF::GLFence GLFence;
193-
typedef std::vector<unsigned char*> BufferVector;
194-
typedef stl_ext::thread_group ThreadGroup;
195-
typedef std::vector<int> AudioBuffer;
196-
typedef std::vector<AudioBuffer> AudioBufferVector;
197-
typedef std::vector<Time> TimeVector;
198-
typedef TwkGLF::GLFBO GLFBO;
199-
typedef AUTOCIRCULATE_TRANSFER_STATUS_STRUCT StatusStruct;
200-
typedef std::vector<NTV2Channel> ChannelVector;
201-
typedef std::vector<std::pair<ULWord, ULWord> > VPIDVector;
183+
using Timer = TwkUtil::Timer;
184+
using GLFence = TwkGLF::GLFence;
185+
using BufferVector = std::vector<unsigned char*>;
186+
using ThreadGroup = stl_ext::thread_group;
187+
using AudioBuffer = std::vector<int>;
188+
using AudioBufferVector = std::vector<AudioBuffer>;
189+
using TimeVector = std::vector<Time>;
190+
using GLFBO = TwkGLF::GLFBO;
191+
using StatusStruct = AUTOCIRCULATE_TRANSFER_STATUS_STRUCT;
192+
using ChannelVector = std::vector<NTV2Channel>;
193+
using VPIDVector = std::vector<std::pair<ULWord, ULWord>>;
202194

203195
//
204196
// This is basically the ring buffer element. Each method uses
@@ -244,7 +236,7 @@ namespace AJADevices
244236
Mutex stateMutex;
245237
};
246238

247-
typedef std::vector<FrameData> FrameDataVector;
239+
using FrameDataVector = std::vector<FrameData>;
248240

249241
//
250242
// VideoChannel is a logical indepenent output. For example the
@@ -273,7 +265,7 @@ namespace AJADevices
273265
FrameDataVector data;
274266
};
275267

276-
typedef std::vector<VideoChannel*> VideoChannelVector;
268+
using VideoChannelVector = std::vector<VideoChannel*>;
277269

278270
//
279271
// See next comment for explanation
@@ -308,92 +300,92 @@ namespace AJADevices
308300
// stereo, or quad 4K, can be used.
309301
//
310302

311-
KonaVideoDevice( AJAModule*, const std::string& name, unsigned int devicenum,
303+
KonaVideoDevice( AJAModule*, const std::string& name, unsigned int deviceIndex,
312304
unsigned int appID, OperationMode mode = OperationMode::ProMode );
313305

314-
virtual ~KonaVideoDevice();
306+
~KonaVideoDevice() override;
315307

316308
//
317309
// KonaVideoDevice API
318310
//
319311

320-
virtual Time outputTime() const;
321-
virtual Time inputTime() const;
322-
virtual void resetClock() const;
312+
Time outputTime() const override;
313+
Time inputTime() const override;
314+
void resetClock() const override;
323315

324-
virtual void beginTransfer() const;
325-
virtual void endTransfer() const;
316+
void beginTransfer() const override;
317+
void endTransfer() const override;
326318

327319
//
328320
// GLBindableVideoDevice API
329321
//
330322

331-
virtual bool isStereo() const;
332-
virtual bool isDualStereo() const;
323+
bool isStereo() const override;
324+
bool isDualStereo() const override;
333325

334-
virtual bool willBlockOnTransfer() const;
335-
virtual void bind( const TwkGLF::GLVideoDevice* ) const;
336-
virtual void bind2( const TwkGLF::GLVideoDevice*,
337-
const TwkGLF::GLVideoDevice* ) const;
338-
virtual void transfer( const TwkGLF::GLFBO* ) const;
339-
virtual void transfer2( const TwkGLF::GLFBO*, const TwkGLF::GLFBO* ) const;
326+
bool willBlockOnTransfer() const override;
327+
void bind( const TwkGLF::GLVideoDevice* ) const override;
328+
void bind2( const TwkGLF::GLVideoDevice*,
329+
const TwkGLF::GLVideoDevice* ) const override;
330+
void transfer( const TwkGLF::GLFBO* ) const override;
331+
void transfer2( const TwkGLF::GLFBO*, const TwkGLF::GLFBO* ) const override;
340332

341-
virtual void unbind() const;
333+
void unbind() const override;
342334

343335
//
344336
// VideoDevice Audio API
345337
//
346-
virtual size_t numAudioFormats() const;
347-
virtual AudioFormat audioFormatAtIndex( size_t ) const;
348-
virtual void setAudioFormat( size_t );
349-
virtual size_t currentAudioFormat() const;
350-
virtual void audioFrameSizeSequence( AudioFrameSizeVector& ) const;
351-
virtual void transferAudio( void* interleavedData, size_t n ) const;
338+
size_t numAudioFormats() const override;
339+
AudioFormat audioFormatAtIndex( size_t ) const override;
340+
void setAudioFormat( size_t ) override;
341+
size_t currentAudioFormat() const override;
342+
void audioFrameSizeSequence( AudioFrameSizeVector& ) const override;
343+
void transferAudio( void* interleavedData, size_t n ) const override;
352344

353345
//
354346
// VideoDevice Video API
355347
//
356348

357-
virtual size_t asyncMaxMappedBuffers() const;
358-
virtual Time deviceLatency() const;
359-
360-
virtual size_t numVideoFormats() const;
361-
virtual VideoFormat videoFormatAtIndex( size_t ) const;
362-
virtual void setVideoFormat( size_t );
363-
virtual size_t currentVideoFormat() const;
364-
365-
virtual size_t numVideo4KTransports() const;
366-
virtual Video4KTransport video4KTransportAtIndex( size_t ) const;
367-
virtual void setVideo4KTransport( size_t );
368-
virtual size_t currentVideo4KTransport() const;
369-
370-
virtual size_t numDataFormats() const;
371-
virtual DataFormat dataFormatAtIndex( size_t ) const;
372-
virtual void setDataFormat( size_t );
373-
virtual size_t currentDataFormat() const;
374-
375-
virtual size_t numSyncModes() const;
376-
virtual SyncMode syncModeAtIndex( size_t ) const;
377-
virtual void setSyncMode( size_t );
378-
virtual size_t currentSyncMode() const;
379-
380-
virtual size_t numSyncSources() const;
381-
virtual SyncSource syncSourceAtIndex( size_t ) const;
382-
virtual void setSyncSource( size_t );
383-
virtual size_t currentSyncSource() const;
384-
385-
virtual Resolution resolution() const;
386-
virtual Offset offset() const; // defaults to 0,0
387-
virtual Timing timing() const;
388-
virtual VideoFormat format() const;
389-
virtual size_t width() const;
390-
virtual size_t height() const;
391-
virtual void open( const StringVector& );
392-
virtual void close();
393-
virtual bool isOpen() const;
349+
size_t asyncMaxMappedBuffers() const override;
350+
Time deviceLatency() const override;
351+
352+
size_t numVideoFormats() const override;
353+
VideoFormat videoFormatAtIndex( size_t ) const override;
354+
void setVideoFormat( size_t ) override;
355+
size_t currentVideoFormat() const override;
356+
357+
size_t numVideo4KTransports() const override;
358+
Video4KTransport video4KTransportAtIndex( size_t ) const override;
359+
void setVideo4KTransport( size_t ) override;
360+
size_t currentVideo4KTransport() const override;
361+
362+
size_t numDataFormats() const override;
363+
DataFormat dataFormatAtIndex( size_t ) const override;
364+
void setDataFormat( size_t ) override;
365+
size_t currentDataFormat() const override;
366+
367+
size_t numSyncModes() const override;
368+
SyncMode syncModeAtIndex( size_t ) const override;
369+
void setSyncMode( size_t ) override;
370+
size_t currentSyncMode() const override;
371+
372+
size_t numSyncSources() const override;
373+
SyncSource syncSourceAtIndex( size_t ) const override;
374+
void setSyncSource( size_t ) override;
375+
size_t currentSyncSource() const override;
376+
377+
Resolution resolution() const override;
378+
Offset offset() const override; // defaults to 0,0
379+
Timing timing() const override;
380+
VideoFormat format() const override;
381+
size_t width() const override;
382+
size_t height() const override;
383+
void open( const StringVector& ) override;
384+
void close() override;
385+
bool isOpen() const override;
394386
virtual void makeCurrent() const;
395-
virtual void clearCaches() const;
396-
virtual void syncBuffers() const;
387+
void clearCaches() const override;
388+
void syncBuffers() const override;
397389

398390
void threadMain();
399391
void lockDevice( bool lock, const char* threadName = "" ) const;
@@ -446,9 +438,8 @@ namespace AJADevices
446438
void routeHDMI( NTV2Standard standard, const KonaDataFormat& d,
447439
bool tsiEnabled, bool outputIsRGB );
448440

449-
private:
450441
unsigned int m_appID{ 0 };
451-
unsigned int m_devicenum{ 0 };
442+
unsigned int m_deviceIndex{ 0 };
452443
NTV2DeviceID m_deviceID{ DEVICE_ID_INVALID };
453444
CNTV2Card* m_card{ nullptr };
454445
NTV2EveryFrameTaskMode m_taskMode{ NTV2_TASK_MODE_INVALID };

‎src/plugins/output/AJADevices/AJAModule.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,8 @@
1919
#endif
2020
#include <sstream>
2121
#include "ajatypes.h"
22-
#include "ntv2enums.h"
23-
#include "ntv2devicefeatures.h"
2422
#include "ntv2devicescanner.h"
2523
#include <ntv2card.h>
26-
#include "ntv2utils.h"
2724

2825
namespace AJADevices
2926
{

‎src/plugins/output/AJADevices/KonaVideoDevice.cpp‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
#include "ntv2devicefeatures.h"
2828
#include "ntv2formatdescriptor.h"
29+
#include "ntv2vpid.h"
2930
#include <stl_ext/replace_alloc.h>
3031
#include <boost/program_options.hpp>
3132
#include <boost/algorithm/string.hpp>
@@ -600,15 +601,15 @@ namespace AJADevices
600601
bool KonaVideoDevice::m_infoFeedback = false;
601602

602603
KonaVideoDevice::KonaVideoDevice( AJAModule* m, const string& name,
603-
unsigned int devicenum, unsigned int appID,
604+
unsigned int deviceIndex, unsigned int appID,
604605
OperationMode mode )
605606
: GLBindableVideoDevice( m, name,
606607
BlockingTransfer | ASyncReadBack | ImageOutput |
607608
ProvidesSync | FixedResolution |
608609
NormalizedCoordinates | FlippedImage |
609610
Clock | AudioOutput ),
610611
m_appID( appID ),
611-
m_devicenum( devicenum ),
612+
m_deviceIndex( deviceIndex ),
612613
m_card( 0 ),
613614
m_operationMode( mode ),
614615
m_bound( false ),
@@ -710,7 +711,7 @@ namespace AJADevices
710711
//
711712
// Again, this affects *only* 4K timings.
712713

713-
m_card = new CNTV2Card( m_devicenum );
714+
m_card = new CNTV2Card( m_deviceIndex );
714715
bool ok = m_card->IsOpen();
715716

716717
if( ok )
@@ -721,7 +722,7 @@ namespace AJADevices
721722
m_deviceNumVideoChannels = NTV2DeviceGetNumVideoChannels( m_deviceID );
722723
m_deviceHasDualLink = NTV2DeviceCanDoDualLink( m_deviceID );
723724
m_deviceHas3G = NTV2DeviceCanDo3GOut(
724-
m_deviceID, 0 ); // XXX this 0 might need to be m_info->deviceIndex
725+
m_deviceID, 0 );
725726
m_deviceHDMIVersion = NTV2DeviceGetHDMIVersion( m_deviceID );
726727
m_deviceHasHDMIStereo = NTV2DeviceCanDoHDMIOutStereo( m_deviceID );
727728
m_deviceHasCSC = NTV2DeviceCanDoWidget( m_deviceID, NTV2_WgtCSC1 );
@@ -891,7 +892,7 @@ namespace AJADevices
891892
m_actualVideoFormat = videoFormatsCP[0];
892893
m_actualDataFormat = dataFormatsCP[0];
893894

894-
if( !m_open ) m_card = new CNTV2Card( m_devicenum );
895+
if( !m_open ) m_card = new CNTV2Card( m_deviceIndex );
895896

896897
m_channelVector.clear();
897898

@@ -1120,7 +1121,7 @@ namespace AJADevices
11201121
cout << "INFO: simple-routing = " << (int)m_simpleRouting << endl;
11211122
}
11221123

1123-
m_card = new CNTV2Card( m_devicenum );
1124+
m_card = new CNTV2Card( m_deviceIndex );
11241125

11251126
m_open = m_card->IsOpen();
11261127

0 commit comments

Comments
 (0)