Mixxx

Merge lp://qastaging/~mattmik/mixxx/features_passthrough into lp://qastaging/~mixxxdevelopers/mixxx/trunk

  1. features_passthrough
  2. Merge into trunk
Proposed by Matthew Mikolay
Status: Needs review
Proposed branch: lp://qastaging/~mattmik/mixxx/features_passthrough
Merge into: lp://qastaging/~mixxxdevelopers/mixxx/trunk
Diff against target: 609 lines (+239/-101)
12 files modified
mixxx/build/depends.py (+0/-1)
mixxx/res/skins/Deere1280x800-WXGA/skin.xml (+1/-1)
mixxx/src/basetrackplayer.cpp (+9/-5)
mixxx/src/basetrackplayer.h (+4/-0)
mixxx/src/engine/enginedeck.cpp (+133/-8)
mixxx/src/engine/enginedeck.h (+34/-2)
mixxx/src/engine/enginemaster.cpp (+2/-0)
mixxx/src/engine/enginepassthrough.h (+0/-51)
mixxx/src/engine/enginepregain.cpp (+18/-22)
mixxx/src/engine/enginepregain.h (+2/-1)
mixxx/src/mixxx.cpp (+17/-4)
mixxx/src/soundmanager.cpp (+19/-6)
To merge this branch: bzr merge lp://qastaging/~mattmik/mixxx/features_passthrough
Reviewer Review Type Date Requested Status
RJ Skerry-Ryan Approve
Review via email: mp+109726@code.qastaging.launchpad.net

Description of the change

Passthrough has been implemented through the EngineDeck class. This required some modifications to additional classes.

Passthrough for a certain deck is enabled using a ControlPushButton linked to the ConfigKey "passthrough_enabled". Passthrough uses the vinyl inputs for a deck specified in the Preferences dialog.

Please ignore all modifications to the EnginePassthrough class, as passthrough using this class is deprecated.

If there are any questions, please contact me!

To post a comment you must log in.
lp://qastaging/~mattmik/mixxx/features_passthrough updated
3255. By Daniel Schürmann

merged with lp:mixxx/1.10

3256. By RJ Skerry-Ryan

Add patch from Max Linke for Bug #1002330 to fix some more star-rating issues.

3257. By RJ Skerry-Ryan

Merging bkgood's lp:~mixxxdevelopers/mixxx/fixes_midi_burnout branch to lp:mixxx.

3258. By RJ Skerry-Ryan

On Linux, use a 5ms polling interval instead of 1ms. Workaround for Bug #990992 until we have a better fix.

3259. By jus

ic_template_keyboard_mapping_sheet.svg re-drawn and arranged more clearly. Makes future maintainance easier if keyboard shortcuts change.

3260. By Daniel Schürmann

set default recording folder to QDesktopServices::MusicLocation

3261. By RJ Skerry-Ryan

Add Max Linke's patch to add a 'Hidden Tracks' view to Mixxx and change default terminology from 'remove' to 'hide'. Fixes Bug #949828

3262. By RJ Skerry-Ryan

Remove redundant rollback since ScopedTransaction auto-rollbacks when it leaves scope w/o being committed.

3263. By RJ Skerry-Ryan

For some reason bzr patch did not add hiddentablemodel.cpp from Max's patch.

3264. By RJ Skerry-Ryan

Not my day today .. add hiddentablemodel.h

3265. By RJ Skerry-Ryan

Add mutil's patch to close the preference dialog when quitting Mixxx. Fixes Bug #1007958

3266. By RJ Skerry-Ryan

Add Max Linke's patch to fix external drag and drop. Fixes Bug #1014842

3267. By RJ Skerry-Ryan

Add patch from daschuer and mutil that warns the user if the skin does not match their screen resolution. Fixes Bug #1011002

3268. By RJ Skerry-Ryan

Add Numark OMNI control preset from Baxter.

3269. By RJ Skerry-Ryan

Re-enable bitrate column and allow bitrate: search queries. Fixes Bug #1008872

3270. By RJ Skerry-Ryan

When a CO does not exist, make it a toggle ControlPushButton by default instead of a ControlObject. Fixes Bug #1009547

3271. By RJ Skerry-Ryan

Add missing warning icon.

3272. By jus

Add new preferences icon for controllers & update icon template accordingly, fixes lp:992813

3273. By RJ Skerry-Ryan

Add Max Linke's patch to clean up cues, analyses, crates and playlists on purge of tracks from the library. Fixes Bug #949828

3274. By RJ Skerry-Ryan

Add patch from daschuer to improve schema upgrade error messages. Fixes Bug #963408

3275. By RJ Skerry-Ryan

Version bump to 1.11.0 beta1

3276. By RJ Skerry-Ryan

Add 1.11.0~beta1-0ubuntu1 to Debian changelog.

3277. By RJ Skerry-Ryan

Add Numark N4 preset from dj.stuartbrand.

3278. By RJ Skerry-Ryan

Merging lp:~hile/mixxx/forumlinks into lp:mixxx/1.11

3279. By RJ Skerry-Ryan

Add support for displaying wiki links from presets in the controller preferences dialog.

3280. By RJ Skerry-Ryan

Minor preset cleanups.

3281. By RJ Skerry-Ryan

Potentially fix PPA upload by supporting an explicit ubuntu_ppa SConscript command and allowing ubuntu_dist to be a comma separated list of distros to upload for. This allows us to have one original source tarball for all the individual Ubuntu versions we support.

3282. By RJ Skerry-Ryan

Merging from lp:mixxx

3283. By RJ Skerry-Ryan

Hack the mixxx_version when we're doing a PPA upload by appending -bzrXXXX.

3284. By RJ Skerry-Ryan

Merging from lp:mixxx/1.11

3285. By RJ Skerry-Ryan

Merging from lp:mixxx/1.11

3286. By Daniel Schürmann

Merging from lp:mixxx/1.11

3287. By RJ Skerry-Ryan

Merging from lp:mixxx/1.11

3288. By Daniel Schürmann

merged with lp:mixxx/1.11

3289. By Daniel Schürmann

merged with lp:mixxx/1.11

3290. By RJ Skerry-Ryan

Merging from lp:mixxx/1.11

3291. By Daniel Schürmann

merged with lp:mixxx/1.11

3292. By Matthew Mikolay

Merging from lp:mixxx/1.11

3293. By Matthew Mikolay

Merging from lp:mixxx/1.11

3294. By Matthew Mikolay

Merging from lp:mixxx

Revision history for this message
RJ Skerry-Ryan (rryan) wrote :

Thanks Matt -- Owen merged this a few days ago.

review: Approve
Reply

Unmerged revisions

3294. By Matthew Mikolay

Merging from lp:mixxx

3293. By Matthew Mikolay

Merging from lp:mixxx/1.11

3292. By Matthew Mikolay

Merging from lp:mixxx/1.11

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.