Mixxx

Merge lp:~neale/mixxx/bulk into lp:~mixxxdevelopers/mixxx/trunk

  1. bulk
  2. Merge into trunk
Proposed by Neale Pickett
Status: Merged
Merged at revision: 3303
Proposed branch: lp:~neale/mixxx/bulk
Merge into: lp:~mixxxdevelopers/mixxx/trunk
Diff against target: 68 lines (+20/-1)
3 files modified
mixxx/res/controllers/Hercules DJ Control MP3 e2.bulk.xml (+4/-1)
mixxx/src/controllers/controllerpresetinfo.cpp (+15/-0)
mixxx/src/controllers/controllerpresetinfo.h (+1/-0)
To merge this branch: bzr merge lp:~neale/mixxx/bulk
Reviewer Review Type Date Requested Status
Mixxx Development Team Pending
Review via email: mp+128624@code.launchpad.net

Description of the change

make bulk controllers (Hercules MP3e2 only, currently) work again.

To post a comment you must log in.
lp:~neale/mixxx/bulk updated
3301. By RJ Skerry-Ryan

Merging from lp:mixxx/1.11

3302. By Neale Pickett

Merge upstream

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mixxx/res/controllers/Hercules DJ Control MP3 e2.bulk.xml'
2--- mixxx/res/controllers/Hercules DJ Control MP3 e2.bulk.xml 2012-09-04 06:42:49 +0000
3+++ mixxx/res/controllers/Hercules DJ Control MP3 e2.bulk.xml 2012-10-09 23:32:23 +0000
4@@ -4,8 +4,11 @@
5 <name>Hercules DJ Control MP3 e2</name>
6 <author>Neale Pickett</author>
7 <description>Hercules DJ Control MP3 e2</description>
8+ <devices>
9+ <product protocol="bulk" vendor_id="0x06f8" product_id="0x0b105" in_epaddr="0x82" out_epaddr="0x03" />
10+ </devices>
11 </info>
12- <controller id="DJ">
13+ <controller id="Hercules DJ Control MP3 e2">
14 <scriptfiles>
15 <file functionprefix="" filename="common-bulk-midi.js"/>
16 <file functionprefix="" filename="Hercules DJ Control MP3 e2-scripts.js"/>
17
18=== modified file 'mixxx/src/controllers/controllerpresetinfo.cpp'
19--- mixxx/src/controllers/controllerpresetinfo.cpp 2012-07-10 22:07:56 +0000
20+++ mixxx/src/controllers/controllerpresetinfo.cpp 2012-10-09 23:32:23 +0000
21@@ -69,6 +69,8 @@
22 QString protocol = product.attribute("protocol","");
23 if (protocol=="hid") {
24 products.append(parseHIDProduct(product));
25+ } else if (protocol=="bulk") {
26+ products.append(parseBulkProduct(product));
27 } else if (protocol=="midi") {
28 qDebug("MIDI product info parsing not yet implemented");
29 //products.append(parseMIDIProduct(product);
30@@ -83,6 +85,18 @@
31 }
32 }
33
34+QHash<QString,QString> PresetInfo::parseBulkProduct(const QDomElement& element) const {
35+ // <product protocol="bulk" vendor_id="0x06f8" product_id="0x0b105" in_epaddr="0x82" out_epaddr="0x03">
36+
37+ QHash<QString,QString> product;
38+ product.insert("protocol", element.attribute("protocol",""));
39+ product.insert("vendor_id", element.attribute("vendor_id",""));
40+ product.insert("product_id", element.attribute("product_id",""));
41+ product.insert("in_epaddr", element.attribute("in_epaddr",""));
42+ product.insert("out_epaddr", element.attribute("out_epaddr",""));
43+ return product;
44+}
45+
46 QHash<QString,QString> PresetInfo::parseHIDProduct(const QDomElement& element) const {
47 // HID device <product> element parsing. Example of valid element:
48 // <product protocol="hid" vendor_id="0x1" product_id="0x2" usage_page="0x3" usage="0x4" interface_number="0x3" />
49@@ -128,6 +142,7 @@
50 fileExtensions.append(QString(".midi.xml"));
51 fileExtensions.append(QString(".cntrlr.xml"));
52 fileExtensions.append(QString(".hid.xml"));
53+ fileExtensions.append(QString(".bulk.xml"));
54 fileExtensions.append(QString(".osc.xml"));
55
56 loadSupportedPresets();
57
58=== modified file 'mixxx/src/controllers/controllerpresetinfo.h'
59--- mixxx/src/controllers/controllerpresetinfo.h 2012-06-22 04:16:39 +0000
60+++ mixxx/src/controllers/controllerpresetinfo.h 2012-10-09 23:32:23 +0000
61@@ -39,6 +39,7 @@
62 inline const QList< QHash<QString,QString> > getProducts() const { return products; };
63
64 private:
65+ QHash<QString,QString> parseBulkProduct(const QDomElement& element) const;
66 QHash<QString,QString> parseHIDProduct(const QDomElement& element) const;
67 // Note - following are just stubs, not yet implemented
68 QHash<QString,QString> parseMIDIProduct(const QDomElement& element) const;