Changeset 25

Timestamp:

11/27/04 08:55:32 (18 years ago)

Author:

pieterpalmers

Message:

- updated the AvMusicStatusDescriptor? to automatically parse itself upon creation

Files:

• trunk/freebob/src/avdescriptor.cpp (modified) (3 diffs)
• trunk/freebob/src/avdescriptor.h (modified) (2 diffs)
• trunk/freebob/src/avmusicstatusdescriptor.cpp (modified) (3 diffs)
• trunk/freebob/src/avmusicstatusdescriptor.h (modified) (2 diffs)
• trunk/freebob/src/ieee1394service.cpp (modified) (2 diffs)

trunk/freebob/src/avdescriptor.cpp

@@ -42 +42 @@
-        bOpen=false;
-        iAccessType=0;
+        bValid=false; // don't know yet what I'm going to do with this in the generic descriptor
-}
-
@@ -248 +249 @@
-        if (((response[0] & 0xFF000000)==AVC1394_RESPONSE_NOT_IMPLEMENTED) || ((response[1] & 0xFF000000)==0x04)) { 
-                fprintf(stderr,"Descriptor not present.\n");
+                bValid=false;
-                return false;
-        } 
@@ -263 +265 @@
-        return bLoaded;
-}
+
+bool AvDescriptor::isValid() {
+        return bValid;
+}
+
-
-unsigned int AvDescriptor::getLength() {

trunk/freebob/src/avdescriptor.h

@@ -41 +41 @@
-    bool isOpen();
-    bool canWrite();
+    bool isValid();
-    
- protected:
@@ -48 +49 @@
-    bool bLoaded;
-    bool bOpen;
+    bool bValid;
-    unsigned int iAccessType;
-    unsigned int iLength;

trunk/freebob/src/avmusicstatusdescriptor.cpp

@@ -21 +21 @@
-#include "avdevice.h"
-#include "avdescriptor.h"
+#include "avmusicidentifierdescriptor.h"
-#include "avmusicstatusdescriptor.h"
+#include "avinfoblock.h"
+#include "avgeneralmusicstatusinfoblock.h"
+#include "avnameinfoblock.h"
+#include "avaudioinfoblock.h"
+#include "avmidiinfoblock.h"
+#include "avaudiosyncinfoblock.h"
+#include "avsourcepluginfoblock.h"
+#include "avoutputplugstatusinfoblock.h"
-
-AvMusicStatusDescriptor::AvMusicStatusDescriptor(AvDevice *parent) : AvDescriptor(parent, AVC1394_SUBUNIT_TYPE_MUSIC | AVC1394_SUBUNIT_ID_0,0x80) {
@@ -38 +47 @@
-        
-        if (!(this->AvDescriptor::isOpen())) {
-fprintf(stderr,
+debugPrint (DEBUG_LEVEL_INFO, 
-                this->AvDescriptor::OpenReadOnly();
-                if (!(this->AvDescriptor::isOpen()) ) {
-                        fprintf(stderr,"AvMusicStatusDescriptor:   Failed!\n");
+                        bValid=false;
-                        return;
-                }
@@ -47 +57 @@
-        
-        if (!(this->AvDescriptor::isLoaded())) {
-fprintf(stderr,
+debugPrint (DEBUG_LEVEL_INFO, 
-                this->AvDescriptor::Load();
-                if (!(this->AvDescriptor::isLoaded())) {
-                        fprintf(stderr,"AvMusicStatusDescriptor:   Failed!\n");
+                        bValid=false;
-                        return;
-                }
-        }
-        
-
-
+
+
+
-        
-
+
+
+
+
+
+
+
+
-        
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        
-}

trunk/freebob/src/avmusicstatusdescriptor.h

@@ -31 +31 @@
-
-
+class AvGeneralMusicInfoBlock;
+class AvOutputPlugStatusInfoBlock;
+
-class AvMusicStatusDescriptor : public AvDescriptor {
- public:
@@ -39 +42 @@
-
- protected:
+       AvGeneralMusicInfoBlock      *cGeneralMusicInfoBlock;
+       AvOutputPlugStatusInfoBlock  *cOutputPlugStatusInfoBlock;
-       
- private:

trunk/freebob/src/ieee1394service.cpp

@@ -223 +223 @@
-                        debugPrint (DEBUG_LEVEL_INFO, "    Created...\n");
-                        testdesc_mid2->printCapabilities();
-
+#if 0
-                        // test the AvInfoBlock
-                        debugPrint (DEBUG_LEVEL_INFO, "    Trying to create an AvInfoBlock...\n");
@@ -312 +312 @@
-                        
-                        delete testblock8;
-
+#endif
-                        debugPrint (DEBUG_LEVEL_INFO, "    Deleting AvMusicStatusDescriptor...\n");
-                        delete testdesc_mid2;