Navigation

Changeset 38

Timestamp:

12/03/04 15:04:03 (18 years ago)

Author:

pieterpalmers

Message:

- Added classes to parse the infoblocks new to the 1.1 version of the AV/C Music Subunit spec
- Implemented some prototype parsing in these classes

Files:

r35	r38
138	138	case 0x0C: // music subunit
139	139	tmpAvDeviceSubunit=new AvDeviceMusicSubunit(this,subunit_id);
140		{ // just a test
	140	/*{ // just a test
141	141	AvDeviceMusicSubunit tmpAvDeviceSubunit2(this,subunit_id);
142	142	tmpAvDeviceSubunit2.printMusicPlugInfo();
…	…
144	144	tmpAvDeviceSubunit2.printOutputPlugConnections();
145	145	tmpAvDeviceSubunit2.test();
146		}
	146	}*/
147	147	break;
148	148

r26	r38
31	31	#include "avsourcepluginfoblock.h"
32	32	#include "avoutputplugstatusinfoblock.h"
	33	#include "avroutingstatusinfoblock.h"
33	34
34	35	AvMusicStatusDescriptor::AvMusicStatusDescriptor(AvDevice *parent, unsigned char id) : AvDescriptor(parent, AVC1394_SUBUNIT_TYPE_MUSIC \| (id << 16),0x80) {
…	…
85	86	offset += cOutputPlugStatusInfoBlock->getLength()+2;
86	87
	88	debugPrint (DEBUG_LEVEL_DESCRIPTOR, "AvMusicStatusDescriptor: Creating AvRoutingStatusInfoBlock... (offset=0x%04X)\n",offset);
	89	cRoutingStatusInfoBlock=new AvRoutingStatusInfoBlock(this,offset);
	90	if (!(cRoutingStatusInfoBlock) \|\| !(cRoutingStatusInfoBlock->isValid())) {
	91	debugPrint (DEBUG_LEVEL_DESCRIPTOR, "AvMusicStatusDescriptor: AvRoutingStatusInfoBlock not found!\n");
	92	bValid=false;
	93	return;
	94	}
	95	debugPrint (DEBUG_LEVEL_DESCRIPTOR, "AvMusicStatusDescriptor: AvRoutingStatusInfoBlock found: length=0x%04X\n",cRoutingStatusInfoBlock->getLength());
	96
	97	offset += cRoutingStatusInfoBlock->getLength()+2;
	98
87	99	// start parsing the optional infoblock(s)
88	100	AvInfoBlock *tmpInfoBlock = NULL;

r26	r38
33	33	class AvGeneralMusicInfoBlock;
34	34	class AvOutputPlugStatusInfoBlock;
	35	class AvRoutingStatusInfoBlock;
35	36
36	37	class AvMusicStatusDescriptor : public AvDescriptor {
…	…
42	43
43	44	protected:
44		AvGeneralMusicInfoBlock *cGeneralMusicInfoBlock;
45		AvOutputPlugStatusInfoBlock *cOutputPlugStatusInfoBlock;
46
	45	AvGeneralMusicInfoBlock *cGeneralMusicInfoBlock;
	46	AvOutputPlugStatusInfoBlock *cOutputPlugStatusInfoBlock;
	47	AvRoutingStatusInfoBlock *cRoutingStatusInfoBlock;
47	48	private:
48	49

r26	r38
90	90	break;
91	91	default:
92		debugPrint(DEBUG_LEVEL_INFOBLOCK,"AvSourcePlugInfoBlock: Skipping unknown block~~\n"~~);
	92	debugPrint(DEBUG_LEVEL_INFOBLOCK,"AvSourcePlugInfoBlock: Skipping unknown block type 0x%04X\n",tmpInfoBlock->getType());
93	93	break;
94	94

r35	r38
36	36
37	37	#define DEBUG_LEVEL_MODERATE (DEBUG_LEVEL_INFO \| DEBUG_LEVEL_DEVICE \| DEBUG_LEVEL_SUBUNIT)
	38	#define DEBUG_LEVEL_HIGH (DEBUG_LEVEL_MODERATE \| DEBUG_LEVEL_DESCRIPTOR \| DEBUG_LEVEL_INFOBLOCK)
38	39
39		#define DEBUG_LEVEL DEBUG_LEVEL_~~MODERATE~~
	40	#define DEBUG_LEVEL DEBUG_LEVEL_HIGH
40	41
41	42	#define DEBUG

r26	r38
218	218	debugPrint (DEBUG_LEVEL_INFO, " Deleting AvMusicIdentifierDescriptor...\n");
219	219	delete testdesc_mid;
	220	#endif
220	221
221	222	// test the AvMusicStatusDescriptor
…	…
224	225	debugPrint (DEBUG_LEVEL_INFO, " Created...\n");
225	226	testdesc_mid2->printCapabilities();
226
	227	#if 0
227	228	// test the AvInfoBlock
228	229	debugPrint (DEBUG_LEVEL_INFO, " Trying to create an AvInfoBlock...\n");
…	…
314	315	delete testblock8;
315	316	debugPrint (DEBUG_LEVEL_INFO, " Deleting AvMusicStatusDescriptor...\n");
	317	#endif
316	318	delete testdesc_mid2;
317		~~#endif~~
318	319	}
319	320	debugPrint (DEBUG_LEVEL_INFO, " Deleting AvDevice...\n");

r28	r38
65	65	avoutputplugstatusinfoblock.h \
66	66	avoutputplugstatusinfoblock.cpp \
	67	avroutingstatusinfoblock.h \
	68	avroutingstatusinfoblock.cpp \
	69	avpluginfoblock.h \
	70	avpluginfoblock.cpp \
	71	avmusicpluginfoblock.h \
	72	avmusicpluginfoblock.cpp \
	73	avclusterinfoblock.h \
	74	avclusterinfoblock.cpp \
67	75	debugmodule.cpp \
68	76	main.cpp