forked from mixxxdj/mixxx
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Loading status checks…
Merge branch 'mixxxdj:main' into AutoDj-Radio-Laneway-Transition
Showing
54 changed files
with
306 additions
and
228 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -157,7 +157,7 @@ jobs: | |
- name: "Upload Coverage Report to coveralls.io" | ||
if: matrix.name == 'coverage' | ||
continue-on-error: true | ||
uses: coverallsapp/[email protected].0 | ||
uses: coverallsapp/[email protected].1 | ||
with: | ||
flag-name: ubuntu-22.04 | ||
path-to-lcov: build/lcov.info | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -473,7 +473,7 @@ jobs: | |
- name: "Upload GitHub Actions artifacts" | ||
if: matrix.artifacts_path != null | ||
uses: actions/[email protected].1 | ||
uses: actions/[email protected].3 | ||
with: | ||
name: ${{ matrix.artifacts_name }} | ||
path: ${{ matrix.artifacts_path }} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -67,14 +67,14 @@ jobs: | |
|
||
- name: "Upload patch artifact" | ||
if: failure() && env.UPLOAD_PATCH_FILE != null | ||
uses: actions/[email protected].1 | ||
uses: actions/[email protected].3 | ||
with: | ||
name: ${{ env.UPLOAD_PATCH_FILE }} | ||
path: ${{ env.UPLOAD_PATCH_FILE }} | ||
|
||
- name: "Upload pre-commit.log" | ||
if: failure() && env.UPLOAD_PATCH_FILE == null | ||
uses: actions/[email protected].1 | ||
uses: actions/[email protected].3 | ||
with: | ||
name: pre-commit.log | ||
path: /github/home/.cache/pre-commit/pre-commit.log | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,31 @@ | ||
#pragma once | ||
|
||
#include <cstdint> | ||
#include <optional> | ||
|
||
struct bulk_device_id { | ||
std::uint16_t vendor_id; | ||
std::uint16_t product_id; | ||
}; | ||
|
||
// A list of supported USB bulk devices | ||
|
||
#pragma once | ||
struct bulk_device_endpoints { | ||
std::uint8_t in_epaddr; | ||
std::uint8_t out_epaddr; | ||
// we may not know the interface, in which case we should not try to claim it. | ||
// these devices are likely unusable on windows without claiming the correct interface. | ||
std::optional<std::uint8_t> interface_number; | ||
}; | ||
|
||
typedef struct bulk_supported { | ||
unsigned short vendor_id; | ||
unsigned short product_id; | ||
unsigned char in_epaddr; | ||
unsigned char out_epaddr; | ||
unsigned int interface_number; | ||
} bulk_supported_t; | ||
struct bulk_support_lookup { | ||
bulk_device_id key; | ||
bulk_device_endpoints endpoints; | ||
}; | ||
|
||
static bulk_supported_t bulk_supported[] = { | ||
{0x06f8, 0xb105, 0x82, 0x03, 0}, // Hercules MP3e2 | ||
{0x06f8, 0xb107, 0x83, 0x03, 0}, // Hercules Mk4 | ||
{0x06f8, 0xb100, 0x86, 0x06, 0}, // Hercules Mk2 | ||
{0x06f8, 0xb120, 0x82, 0x03, 0}, // Hercules MP3 LE / Glow | ||
{0, 0, 0, 0, 0}}; | ||
constexpr static bulk_support_lookup bulk_supported[] = { | ||
{{0x06f8, 0xb105}, {0x82, 0x03, std::nullopt}}, // Hercules MP3e2 | ||
{{0x06f8, 0xb107}, {0x83, 0x03, std::nullopt}}, // Hercules Mk4 | ||
{{0x06f8, 0xb100}, {0x86, 0x06, std::nullopt}}, // Hercules Mk2 | ||
{{0x06f8, 0xb120}, {0x82, 0x03, std::nullopt}}, // Hercules MP3 LE / Glow | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.