Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated the property path for track key to Traktor 3.2 #32

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updated the property path for track key to Traktor 3.2 #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion qml/Screens/S4MK3/ViewModels/DeckInfo.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Item
AppProperty { id: propDeckType; path: "app.traktor.decks." + deckId + ".type" }
AppProperty { id: propTitle; path: "app.traktor.decks." + deckId + ".content.title" }
AppProperty { id: propArtist; path: "app.traktor.decks." + deckId + ".content.artist" }
AppProperty { id: propKeyForDisplay; path: "app.traktor.decks." + deckId + ".track.key.key_for_display" }
AppProperty { id: propKeyForDisplay; path: "app.traktor.decks." + deckId + ".track.key.resulting.precise" }
AppProperty { id: propFinalKeyId; path: "app.traktor.decks." + deckId + ".track.key.final_id" }
AppProperty { id: propKeyAdjust; path: "app.traktor.decks." + deckId + ".track.key.adjust" }
AppProperty { id: propKeyLockOn; path: "app.traktor.decks." + deckId + ".track.key.lock_enabled" }
Expand Down
2 changes: 1 addition & 1 deletion qml/Screens/S8/Views/Browser/ListDelegate.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Item {
property int browserFontSize: prefs.displayMoreItems ? fonts.scale(15) : fonts.scale(16)

AppProperty { id: masterClockBpm; path: "app.traktor.masterclock.tempo"; onValueChanged: { updateMatchInfo(); } }
AppProperty { id: masterKeyDisplay; path: "app.traktor.decks." + (masterDeckId.value + 1) + ".track.key.key_for_display" ; onValueChanged: { updateMatchInfo(); }}
AppProperty { id: masterKeyDisplay; path: "app.traktor.decks." + (masterDeckId.value + 1) + ".track.key.resulting.precise" ; onValueChanged: { updateMatchInfo(); }}
AppProperty { id: masterDeckId; path: "app.traktor.masterclock.source_id"; onValueChanged: { updateMatchInfo(); } }

height: prefs.displayMoreItems ? 25 : 32
Expand Down
2 changes: 1 addition & 1 deletion qml/Screens/S8/Views/Deck/DeckHeader.qml
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ Item {
// DECK PROPERTIES
//--------------------------------------------------------------------------------------------------------------------

AppProperty { id: deckKeyDisplay; path: "app.traktor.decks." + (deckId+1) + ".track.key.key_for_display"; onValueChanged: { updateKeyColor() } }
AppProperty { id: deckKeyDisplay; path: "app.traktor.decks." + (deckId+1) + ".track.key.resulting.precise"; onValueChanged: { updateKeyColor() } }
AppProperty { id: propMusicalKey; path: "app.traktor.decks." + (deckId+1) + ".content.musical_key" }
AppProperty { id: propSyncMasterDeck; path: "app.traktor.masterclock.source_id" }

Expand Down
2 changes: 1 addition & 1 deletion qml/Screens/S8/Views/Deck/DeckHeaderText.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ Text {
State {
name: "key";
PropertyChanges { target: header_text; font.family: fontForNumber;
text: (!isLoaded)?"":propMusicalKey.value.toString(); }
text: (!isLoaded)?"":deckKeyDisplay.value.toString(); }
},
State {
name: "keyText";
Expand Down
2 changes: 1 addition & 1 deletion qml/Screens/S8/Views/Overlays/CenterOverlays/Keylock.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ CenterOverlay {

AppProperty { id: keyValue; path: "app.traktor.decks." + (deckId+1) + ".track.key.adjust" }
AppProperty { id: keyEnable; path: "app.traktor.decks." + (deckId+1) + ".track.key.lock_enabled" }
AppProperty { id: keyDisplay; path: "app.traktor.decks." + (deckId+1) + ".track.key.key_for_display" }
AppProperty { id: keyDisplay; path: "app.traktor.decks." + (deckId+1) + ".track.key.resulting.precise" }

property real key: keyValue.value * 12
property int offset: (key.toFixed(2) - key.toFixed(0)) * 100.0
Expand Down