Changeset 70563 in vbox for trunk/src/VBox/Main/include

Timestamp:

Jan 12, 2018 5:52:10 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

120250

Message:

Audio/Main: Also made the video recording driver use the new AudioDriver base class, more bugfixing and clearer abstraction for the AudioDriver API.

Location:

trunk/src/VBox/Main/include

Files:

• AudioDriver.h (modified) (5 diffs)
• DisplayImpl.h (modified) (1 diff)
• DrvAudioVideoRec.h (modified) (4 diffs)

trunk/src/VBox/Main/include/AudioDriver.h

@@ -30 +30 @@
 struct AudioDriverCfg
 {
-    AudioDriverCfg(Utf8Str a_strDev = "", unsigned a_uInst = 0, unsigned a_uLUN = 0,
-                   Utf8Str a_strName = "")
+    AudioDriverCfg(Utf8Str a_strDev = "", unsigned a_uInst = 0, Utf8Str a_strName = "")
         : strDev(a_strDev)
         , uInst(a_uInst)
-        , uLUN(a_uLUN)
         , strName(a_strName) { }
 
@@ -41 +39 @@
         this->strDev  = that.strDev;
         this->uInst   = that.uInst;
-        this->uLUN    = that.uLUN;
         this->strName = that.strName;
 
@@ -51 +48 @@
     /** The device instance. */
     unsigned             uInst;
-    /** The LUN the driver is attached to.
-     *  Set the UINT8_MAX if not attached. */
-    unsigned             uLUN;
     /** The driver name. */
     Utf8Str              strName;
@@ -76 +70 @@
     Console *GetParent(void) { return mpConsole; }
 
+    int Initialize(AudioDriverCfg *pCfg);
+
     bool IsAttached(void) { return mfAttached; }
 
-    static DECLCALLBACK(int) Attach(AudioDriver *pThis, AudioDriverCfg *pCfg);
+    static DECLCALLBACK(int) Attach(AudioDriver *pThis);
 
     static DECLCALLBACK(int) Detach(AudioDriver *pThis);
 
-    int Configure(AudioDriverCfg *pCfg, bool fAttach);
+protected:
 
-protected:
+    int configure(unsigned uLUN, bool fAttach);
 
     /**
@@ -105 +101 @@
     /** Whether the driver is attached or not. */
     bool                 mfAttached;
+    /** The LUN the driver is attached to.
+     *  Set the UINT8_MAX if not attached. */
+    unsigned             muLUN;
 };
 

trunk/src/VBox/Main/include/DisplayImpl.h

@@ -212 +212 @@
     VIDEORECFEATURES         i_videoRecGetEnabled(void);
     bool                     i_videoRecStarted(void);
-# ifdef VBOX_WITH_AUDIO_VIDEOREC
-    int                      i_videoRecConfigureAudioDriver(const Utf8Str& strAdapter, unsigned uInstance, unsigned uLUN, bool fAttach);
-# endif
-    static DECLCALLBACK(int) i_videoRecConfigure(Display *pThis, PVIDEORECCFG pCfg, bool fAttachDetach, unsigned *puLUN);
+    void                     i_videoRecInvalidate();
     int                      i_videoRecSendAudio(const void *pvData, size_t cbData, uint64_t uDurationMs);
     int                      i_videoRecStart(void);

trunk/src/VBox/Main/include/DrvAudioVideoRec.h

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2017 Oracle Corporation
+ * Copyright (C) 2017-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -23 +23 @@
 #include <VBox/vmm/pdmifs.h>
 
+#include "AudioDriver.h"
+
+using namespace com;
+
 class Console;
 
-class AudioVideoRec
+class AudioVideoRec : public AudioDriver
 {
 
@@ -37 +41 @@
     static const PDMDRVREG DrvReg;
 
-    Console *getParent(void) { return mpConsole; }
-
 public:
 
@@ -48 +50 @@
 private:
 
+    void configureDriver(PCFGMNODE pLunCfg);
+
     /** Pointer to the associated video recording audio driver. */
     struct DRVAUDIOVIDEOREC *mpDrv;
-    /** Pointer to parent. */
-    Console * const          mpConsole;
 };