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

Jump to bottom

master sync first merge #1

Closed
wants to merge 126 commits into from
Closed

master sync first merge #1

wants to merge 126 commits into from

Commits on Jan 15, 2012

  1. Remove skin not needed for demo, keep 2-deck Deere1280x800-WXGA as fa… 

    …llback
    @esbrandt
    esbrandt committed Jan 15, 2012
    Configuration menu
    Copy the full SHA
    fd68cab View commit details
    Browse the repository at this point in the history

  2. Set default skin to Deere1920x1080-FullHD and work from there for 4-d… 

    …eck support
    @esbrandt
    esbrandt committed Jan 15, 2012
    Configuration menu
    Copy the full SHA
    5b86d71 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2012

  1. Added / changed some graphics for 4-Deck skin

    @esbrandt
    esbrandt committed Jan 16, 2012
    Configuration menu
    Copy the full SHA
    8604071 View commit details
    Browse the repository at this point in the history

  2. Merge from lp:mixxx

    @esbrandt
    esbrandt committed Jan 16, 2012
    Configuration menu
    Copy the full SHA
    b6db9d3 View commit details
    Browse the repository at this point in the history

  3. Add 4-deck support to Deere1920x1080-FullHD skin

    @esbrandt
    esbrandt committed Jan 16, 2012
    Configuration menu
    Copy the full SHA
    39c384d View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2012

  1. Oops, deactivate debugging borders for widgetgroups in skin.xml 

    Fixed some alignments for deck 2& 4 in background image
    @esbrandt
    esbrandt committed Jan 18, 2012
    Configuration menu
    Copy the full SHA
    83eef93 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2012

  1. Merging from lp:~jus/+junk/vci400-demo

    @rryan
    rryan committed Jan 19, 2012
    Configuration menu
    Copy the full SHA
    c2eff7e View commit details
    Browse the repository at this point in the history

  2. Merge updates from jus

    @rryan
    rryan committed Jan 19, 2012
    Configuration menu
    Copy the full SHA
    b361aa6 View commit details
    Browse the repository at this point in the history

  3. Add default skin flags

    @rryan
    rryan committed Jan 19, 2012
    Configuration menu
    Copy the full SHA
    8b1204d View commit details
    Browse the repository at this point in the history

  4. Add mix orientation push buttons for each channel (orientation_left o… 

    …rientation_center and orientation_right). Update FullHD Deere skin to use them.
    @rryan
    rryan committed Jan 19, 2012
    Configuration menu
    Copy the full SHA
    ce4f40f View commit details
    Browse the repository at this point in the history

  5. Updates to vCI-400 mapping

    @rryan
    rryan committed Jan 19, 2012
    Configuration menu
    Copy the full SHA
    c199239 View commit details
    Browse the repository at this point in the history

  6. Add ghetto-sync (TM). Also hook up sampler triggers to VCI-400

    @rryan
    rryan committed Jan 19, 2012
    Configuration menu
    Copy the full SHA
    1b1dcc7 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2012

  1. Merge with lp:mixxx

    @ywwg
    ywwg committed Feb 27, 2012
    Configuration menu
    Copy the full SHA
    676ca2f View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2012

  1. ENVIRONMENT -- do not include in final patch

    @ywwg
    ywwg committed Mar 12, 2012
    Configuration menu
    Copy the full SHA
    ff0a493 View commit details
    Browse the repository at this point in the history

  2. merge from lp:mixxx

    @ywwg
    ywwg committed Mar 12, 2012
    Configuration menu
    Copy the full SHA
    7bb5905 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2012

  1. Initial implementation, untested

    @ywwg
    ywwg committed Mar 19, 2012
    Configuration menu
    Copy the full SHA
    1dd1063 View commit details
    Browse the repository at this point in the history

  2. note to myself that implementation is wrong

    @ywwg
    ywwg committed Mar 19, 2012
    Configuration menu
    Copy the full SHA
    c92a698 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2012

  1. merge from lp:mixxx

    @ywwg
    ywwg committed Mar 21, 2012
    Configuration menu
    Copy the full SHA
    fcf6d58 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2012

  1. refactored everything again -- it compiles now!

    @ywwg
    ywwg committed Mar 25, 2012
    Configuration menu
    Copy the full SHA
    d6c3fce View commit details
    Browse the repository at this point in the history

  2. First successful proof of concept (bpm matching)

    @ywwg
    ywwg committed Mar 25, 2012
    Configuration menu
    Copy the full SHA
    5ad4be0 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2012

  1. implement phase syncing in bpmcontrol.cpp by subtly adjusting rate un… 

    …til we are in sync
    @ywwg
    ywwg committed Mar 31, 2012
    Configuration menu
    Copy the full SHA
    e090c85 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2012

  1. merge with lp:mixxx (big waveform merge)

    @ywwg
    ywwg committed Apr 8, 2012
    Configuration menu
    Copy the full SHA
    3816d75 View commit details
    Browse the repository at this point in the history

  2. begin work on internal sync

    @ywwg
    ywwg committed Apr 8, 2012
    Configuration menu
    Copy the full SHA
    e7d39b5 View commit details
    Browse the repository at this point in the history

  3. Incorporate Ben Clark's amazing library rescan patch (lp:#966963)

    @ywwg
    ywwg committed Apr 8, 2012
    Configuration menu
    Copy the full SHA
    ed47181 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2012

  1. Mostly finish internal sync. It's alive...

    @ywwg
    ywwg committed Apr 9, 2012
    Configuration menu
    Copy the full SHA
    2f522b7 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2012

  1. merge from lp:mixxx

    @ywwg
    ywwg committed Apr 22, 2012
    Configuration menu
    Copy the full SHA
    7754f49 View commit details
    Browse the repository at this point in the history

  2. Allow user to use temp pitch bend, wheel, and jog to tweak sync (when… 

    … beatgrid is slightly off)

Disable seek-to-sync... need to handle this better
    @ywwg
    ywwg committed Apr 22, 2012
    Configuration menu
    Copy the full SHA
    17b42bd View commit details
    Browse the repository at this point in the history

Commits on May 3, 2012

  1. big, troublesome merge with lp:mixxx

    @ywwg
    ywwg committed May 3, 2012
    Configuration menu
    Copy the full SHA
    2cf1acf View commit details
    Browse the repository at this point in the history

  2. if quantize is on, always sync phase (includes play button, hotcues, … 

    …overview waveform, etc)
    @ywwg
    ywwg committed May 3, 2012
    Configuration menu
    Copy the full SHA
    0e67dc9 View commit details
    Browse the repository at this point in the history

  3. when syncing phase remember the user's offset value

    @ywwg
    ywwg committed May 3, 2012
    Configuration menu
    Copy the full SHA
    ce853a1 View commit details
    Browse the repository at this point in the history

  4. phase matching should be against master, not against another track! 

    try to fix user offset stuff
    @ywwg
    ywwg committed May 3, 2012
    Configuration menu
    Copy the full SHA
    2191df7 View commit details
    Browse the repository at this point in the history

  5. moved back to keeping track of user offset in percent, not samples. 

    On every seek there is still a certain amount of error, not sure why (I think we fall behind a loop)
    @ywwg
    ywwg committed May 3, 2012
    Configuration menu
    Copy the full SHA
    ff0c650 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2012

  1. merge from lp:mixxx, try to clean up skin conflict

    @ywwg
    ywwg committed May 14, 2012
    Configuration menu
    Copy the full SHA
    5c9aa1d View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2012

  1. merge from lp:mixxx 

    merge my custom skin from DJO-hacks-trunk
    @ywwg
    ywwg committed Aug 24, 2012
    Configuration menu
    Copy the full SHA
    0ac249e View commit details
    Browse the repository at this point in the history

  2. lots of work getting UI hooked up, still a long way to go

    @ywwg
    ywwg committed Aug 24, 2012
    Configuration menu
    Copy the full SHA
    879c0ec View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2012

  1. fixed not receiving samplerate changes 

    fixed shouldn't adjust sync when quantize is off
don't try to adjust sync at all when near beat boundary
    @ywwg
    ywwg committed Aug 27, 2012
    Configuration menu
    Copy the full SHA
    0c207b8 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2012

  1. Moved master/slave supervision to enginesync instead of per-deck logi… 

    …c, *much* better
    @ywwg
    ywwg committed Aug 28, 2012
    Configuration menu
    Copy the full SHA
    9293e44 View commit details
    Browse the repository at this point in the history

  2. make sure to receive internal disablings of sync_master CO

    @ywwg
    ywwg committed Aug 28, 2012
    Configuration menu
    Copy the full SHA
    75a87bb View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2012

  1. master sync pretty much works

    @ywwg
    ywwg committed Aug 29, 2012
    Configuration menu
    Copy the full SHA
    8999f9f View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2012

  1. Fix slaves not moving in reverse-direction 

    Fix most waveform over-stretching situations
    @ywwg
    ywwg committed Aug 30, 2012
    Configuration menu
    Copy the full SHA
    b0c7e8e View commit details
    Browse the repository at this point in the history

  2. keep pseudoposition always correct even when deck is master 

    clean things up a bit
    @ywwg
    ywwg committed Aug 30, 2012
    Configuration menu
    Copy the full SHA
    99081ad View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2012

  1. merge from lp:mixxx

    @ywwg
    ywwg committed Sep 4, 2012
    Configuration menu
    Copy the full SHA
    bcf5a38 View commit details
    Browse the repository at this point in the history

  2. fix borked merge

    @ywwg
    ywwg committed Sep 4, 2012
    Configuration menu
    Copy the full SHA
    f909aa7 View commit details
    Browse the repository at this point in the history

  3. actually merge in my skin

    @ywwg
    ywwg committed Sep 4, 2012
    Configuration menu
    Copy the full SHA
    2f50b87 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2012

  1. skin customizations

    @ywwg
    ywwg committed Nov 6, 2012
    Configuration menu
    Copy the full SHA
    1ccdbae View commit details
    Browse the repository at this point in the history

Commits on Dec 30, 2012

  1. awful, horrible, giant merge with tons of conflicts. no doubt error-r… 

    …idden (lp:mixxx/1.11)
    @ywwg
    ywwg committed Dec 30, 2012
    Configuration menu
    Copy the full SHA
    5638dc1 View commit details
    Browse the repository at this point in the history

Commits on Dec 31, 2012

  1. fix some merge issues

    @ywwg
    ywwg committed Dec 31, 2012
    Configuration menu
    Copy the full SHA
    5a4c5f0 View commit details
    Browse the repository at this point in the history

  2. hey maybe this should build

    @ywwg
    ywwg committed Dec 31, 2012
    Configuration menu
    Copy the full SHA
    44f4023 View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2013

  1. merge from lp:mixxx/1.11

    @ywwg
    ywwg committed Jan 13, 2013
    Configuration menu
    Copy the full SHA
    3f46f3a View commit details
    Browse the repository at this point in the history

  2. Add basic 4-Deck LateNight1680x1050-WSXGA+ skin and work from here fo… 

    …r use in https://code.launchpad.net/~ywwg/mixxx/master_sync
    @esbrandt
    esbrandt committed Jan 13, 2013
    Configuration menu
    Copy the full SHA
    1294bf0 View commit details
    Browse the repository at this point in the history

  3. Move Play & Cue controls from the Mixer panel to the Decks Panel. 

    TODO:
Move Play & Cue control into Playback control sub-widget, for now use absolute positioning inside the respective Deck's widget
    @esbrandt
    esbrandt committed Jan 13, 2013
    Configuration menu
    Copy the full SHA
    d7e3b7d View commit details
    Browse the repository at this point in the history

  4. Change Cue/Play button positioning

    @esbrandt
    esbrandt committed Jan 13, 2013
    Configuration menu
    Copy the full SHA
    2606d42 View commit details
    Browse the repository at this point in the history

  5. Positioning Microphone WidgetGroup

    @esbrandt
    esbrandt committed Jan 13, 2013
    Configuration menu
    Copy the full SHA
    351e5c2 View commit details
    Browse the repository at this point in the history

  6. Add EQ`s for Deck 3 & 4

    @esbrandt
    esbrandt committed Jan 13, 2013
    Configuration menu
    Copy the full SHA
    0b3b580 View commit details
    Browse the repository at this point in the history

  7. Added Volume Slider, PFL, FX controls for Deck 3 & 4. Move Master vol… 

    …ume display to Mastering widgetGroup, integrate the Decks's volume displays into Deck Volume Slider
    @esbrandt
    esbrandt committed Jan 13, 2013
    Configuration menu
    Copy the full SHA
    d424aff View commit details
    Browse the repository at this point in the history

  8. Remove WidgetGroups debug boarders

    @esbrandt
    esbrandt committed Jan 13, 2013
    Configuration menu
    Copy the full SHA
    e224ec9 View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2013

  1. Apply all changes from r3183-3189 for basic 4-Deck LateNight1280x800-… 

    …WSXGA skin too and continue working on this skin for for use in https://code.launchpad.net/~ywwg/mixxx/master_sync
    @esbrandt
    esbrandt committed Jan 18, 2013
    Configuration menu
    Copy the full SHA
    93a4973 View commit details
    Browse the repository at this point in the history

  2. Reverse cherry pick r3183-3189. Deletes LateNight1680x1050-WSXGA+ whi… 

    …ch is not needed anymore
    @esbrandt
    esbrandt committed Jan 18, 2013
    Configuration menu
    Copy the full SHA
    59e6a25 View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2013

  1. Adapt latest color and spacing fixes from lp:~mixxxdevelopers/mixxx/1… 

    ….11-skins
    @esbrandt
    esbrandt committed Jan 20, 2013
    Configuration menu
    Copy the full SHA
    c6e60be View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2013

  1. Add separate LateNight1280x800-4Deck-WXGA skin folder and work from h… 

    …ere. This is to prevent possible merge issues with lp:mixxx/1.11 . Should have done it from the beginning, sorry for confusion.
    @esbrandt
    esbrandt committed Feb 3, 2013
    Configuration menu
    Copy the full SHA
    57714d8 View commit details
    Browse the repository at this point in the history

  2. Correct <title> in skin.xml

    @esbrandt
    esbrandt committed Feb 3, 2013
    Configuration menu
    Copy the full SHA
    0f6d50c View commit details
    Browse the repository at this point in the history

  3. Merge from lp:mixxx/1.11

    @esbrandt
    esbrandt committed Feb 3, 2013
    Configuration menu
    Copy the full SHA
    25470a4 View commit details
    Browse the repository at this point in the history

  4. Remove obsolete <MarkerColor> from LateNight1280x800-4Deck-WXGA/skin.xml

    @esbrandt
    esbrandt committed Feb 3, 2013
    Configuration menu
    Copy the full SHA
    ca162f6 View commit details
    Browse the repository at this point in the history

  5. Use current Sampler 2&3 row to control Deck 3&4. This make 4 regular … 

    …decks & 2 sampler decks
    @esbrandt
    esbrandt committed Feb 3, 2013
    Configuration menu
    Copy the full SHA
    79af3ab View commit details
    Browse the repository at this point in the history

  6. Match waveform & text color for Deck 1+3 & Deck 2+4

    @esbrandt
    esbrandt committed Feb 3, 2013
    Configuration menu
    Copy the full SHA
    988809e View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2013

  1. Merge from lp:/mixxx/1.11

    @esbrandt
    esbrandt committed Feb 16, 2013
    Configuration menu
    Copy the full SHA
    6b89b70 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2013

  1. merge from lp:mixxx/1.11

    @ywwg
    ywwg committed Apr 16, 2013
    Configuration menu
    Copy the full SHA
    68f4737 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2013

  1. Merge branch 'master' into master_sync 

    Conflicts:
	mixxx/src/engine/bpmcontrol.cpp
	mixxx/src/mixxx.cpp
    @ywwg
    ywwg committed Apr 17, 2013
    Configuration menu
    Copy the full SHA
    113f159 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into master_sync-skin

    @ywwg
    ywwg committed Apr 17, 2013
    Configuration menu
    Copy the full SHA
    f583393 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master_sync-skin' into master_sync 

    Conflicts:
	mixxx/res/skins/LateNight1280x800-WXGA/background1280x800.png
    @ywwg
    ywwg committed Apr 17, 2013
    Configuration menu
    Copy the full SHA
    c647110 View commit details
    Browse the repository at this point in the history

  4. init git ignore file

    @ywwg
    ywwg committed Apr 17, 2013
    Configuration menu
    Copy the full SHA
    3595756 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into master_sync

    @ywwg
    ywwg committed Apr 17, 2013
    Configuration menu
    Copy the full SHA
    28b49e0 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2013

  1. ignore backup files

    @ywwg
    ywwg committed Apr 22, 2013
    Configuration menu
    Copy the full SHA
    5a77b77 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2013

  1. Merge branch 'bzr/master'

    @ywwg
    ywwg committed Apr 24, 2013
    Configuration menu
    Copy the full SHA
    dfbf135 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2013

  1. Merge branch 'bzr/master'

    @ywwg
    ywwg committed Apr 30, 2013
    Configuration menu
    Copy the full SHA
    ae12db7 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2013

  1. Merge branch 'bzr/master'

    @ywwg
    ywwg committed May 2, 2013
    Configuration menu
    Copy the full SHA
    7844874 View commit details
    Browse the repository at this point in the history

Commits on May 4, 2013

  1. Merge branch 'bzr/master'

    @ywwg
    ywwg committed May 4, 2013
    Configuration menu
    Copy the full SHA
    ab1ea6f View commit details
    Browse the repository at this point in the history

Commits on May 5, 2013

  1. Merge branch 'bzr/master'

    @ywwg
    ywwg committed May 5, 2013
    Configuration menu
    Copy the full SHA
    b6269ee View commit details
    Browse the repository at this point in the history

Commits on May 6, 2013

  1. Merge branch 'bzr/master'

    @ywwg
    ywwg committed May 6, 2013
    Configuration menu
    Copy the full SHA
    1da8a25 View commit details
    Browse the repository at this point in the history

  2. merge from lp:mixxx

    @ywwg
    ywwg committed May 6, 2013
    Configuration menu
    Copy the full SHA
    af21b0f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'bzr/master_sync' into master_sync 

    Conflicts:
	mixxx/src/mixxx.cpp
    @ywwg
    ywwg committed May 6, 2013
    Configuration menu
    Copy the full SHA
    de44dcb View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into master_sync

    @ywwg
    ywwg committed May 6, 2013
    Configuration menu
    Copy the full SHA
    f8bf516 View commit details
    Browse the repository at this point in the history

  5. small tweaks

    @ywwg
    ywwg committed May 6, 2013
    Configuration menu
    Copy the full SHA
    bbfdef6 View commit details
    Browse the repository at this point in the history

  6. Clean commit with just my 1080p Hi DPI skins

    @ywwg
    ywwg committed May 6, 2013
    Configuration menu
    Copy the full SHA
    b543c35 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2013

  1. added master and slave assets

    @ywwg
    ywwg committed May 7, 2013
    Configuration menu
    Copy the full SHA
    cec8334 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'DJO_t-biggerskin' into master_sync 

    Conflicts:
	mixxx/res/skins/LateNight1280x800-4Deck-WXGA/skin.xml
    @ywwg
    ywwg committed May 7, 2013
    Configuration menu
    Copy the full SHA
    68d4188 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2013

  1. fix problem with filebpm not getting initialized 

    added debug numbers to skin
    @ywwg
    ywwg committed May 8, 2013
    Configuration menu
    Copy the full SHA
    f6df874 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2013

  1. qtcreator made these I think

    @ywwg
    ywwg committed May 9, 2013
    Configuration menu
    Copy the full SHA
    57f5107 View commit details
    Browse the repository at this point in the history

  2. resize vinyl indicators

    @ywwg
    ywwg committed May 9, 2013
    Configuration menu
    Copy the full SHA
    851c2e1 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'HighDPISkin' into master_sync

    @ywwg
    ywwg committed May 9, 2013
    Configuration menu
    Copy the full SHA
    7f1bf76 View commit details
    Browse the repository at this point in the history

  4. don't try to quantize beat position in small loops 

    move true_rate to enginebuffer so it can track tweaking
    @ywwg
    ywwg committed May 9, 2013
    Configuration menu
    Copy the full SHA
    d48e4e5 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2013

  1. Cherry-pick schema version 18 from features_key so beta testers can u… 

    …se it without getting out of sync with whatever happens to the schema in trunk.
    @rryan @ywwg
    rryan authored and ywwg committed May 11, 2013
    Configuration menu
    Copy the full SHA
    2bac8de View commit details
    Browse the repository at this point in the history

  2. Version bump to 1.12.0-alpha-pre.

    @rryan @ywwg
    rryan authored and ywwg committed May 11, 2013
    Configuration menu
    Copy the full SHA
    012c26d View commit details
    Browse the repository at this point in the history

  3. Add Vedant Agarwala to the contributor list.

    @rryan @ywwg
    rryan authored and ywwg committed May 11, 2013
    Configuration menu
    Copy the full SHA
    fd9cafe View commit details
    Browse the repository at this point in the history

  4. Bring back EnginePassthrough since we could use it for an auxiliary i… 

    …nput.
    @rryan @ywwg
    rryan authored and ywwg committed May 11, 2013
    Configuration menu
    Copy the full SHA
    57b4c03 View commit details
    Browse the repository at this point in the history

  5. Minor nits from the vinyl-passthrough merge. Avoid values() calls on … 

    …QHash and duplicate contains/lookups on QHashes in SoundManager. Move AudioInput connections into PlayerManager, do it for every VINYLCONTROL AudioInput. If we don't get any beyond 2 it shouldn't matter, they just wont get connected/disconnected/received.
    @rryan @ywwg
    rryan authored and ywwg committed May 11, 2013
    Configuration menu
    Copy the full SHA
    148eeba View commit details
    Browse the repository at this point in the history

  6. Remove Q_ASSERTs in EngineDeck. Support mono input (just in case).

    @rryan @ywwg
    rryan authored and ywwg committed May 11, 2013
    Configuration menu
    Copy the full SHA
    ecc1a8a View commit details
    Browse the repository at this point in the history

  7. Update translation templates for https://translations.launchpad.net/m… 

    …ixxx/trunk
    @esbrandt @ywwg
    esbrandt authored and ywwg committed May 11, 2013
    Configuration menu
    Copy the full SHA
    228567a View commit details
    Browse the repository at this point in the history

  8. massive style cleanup 

    fixed decks not receiving signals from engine
changed tweak val to be a ratio, not an absolute
still getting fucked up because of rate slider max/min
    @ywwg
    ywwg committed May 11, 2013
    Configuration menu
    Copy the full SHA
    ea29a76 View commit details
    Browse the repository at this point in the history

  9. move to a single state variable instead of dumb two variables 

    fix loops being created to nearest beat, requiring resync
lots of cleanup
    @ywwg
    ywwg committed May 11, 2013
    Configuration menu
    Copy the full SHA
    c87b1f6 View commit details
    Browse the repository at this point in the history

  10. tons of cleanup

    @ywwg
    ywwg committed May 11, 2013
    Configuration menu
    Copy the full SHA
    e21f398 View commit details
    Browse the repository at this point in the history

  11. fix rate slider clamping rate in slave mode

    @ywwg
    ywwg committed May 11, 2013
    Configuration menu
    Copy the full SHA
    39d9b0f View commit details
    Browse the repository at this point in the history

  12. fix some sync-tweak stuff

    @ywwg
    ywwg committed May 11, 2013
    Configuration menu
    Copy the full SHA
    0719fb3 View commit details
    Browse the repository at this point in the history

  13. always update rateEngine value

    @ywwg
    ywwg committed May 11, 2013
    Configuration menu
    Copy the full SHA
    770901d View commit details
    Browse the repository at this point in the history

  14. Merge branch 'rateEngine' into master_sync 

    Conflicts:
	mixxx/src/engine/enginebuffer.cpp
    @ywwg
    ywwg committed May 11, 2013
    Configuration menu
    Copy the full SHA
    586a386 View commit details
    Browse the repository at this point in the history

  15. use existing rateEngine CO instead of true_rate

    @ywwg
    ywwg committed May 11, 2013
    Configuration menu
    Copy the full SHA
    10cca89 View commit details
    Browse the repository at this point in the history

  16. clean up confusing places where rate sometimes includes baserate adju… 

    …stment

reduce fuzz again
    @ywwg
    ywwg committed May 11, 2013
    Configuration menu
    Copy the full SHA
    2714ff8 View commit details
    Browse the repository at this point in the history

  17. add decks 3 and 4 to vinyl control manager and preferences 

    fix skin
    @ywwg
    ywwg committed May 11, 2013
    Configuration menu
    Copy the full SHA
    852ab5d View commit details
    Browse the repository at this point in the history

  18. more channel 3 and 4 configs 

    unset *all* masters in case we duped
    @ywwg
    ywwg committed May 11, 2013
    Configuration menu
    Copy the full SHA
    cf93d3f View commit details
    Browse the repository at this point in the history

Commits on May 12, 2013

  1. reduce fuzz again

    @ywwg
    ywwg committed May 12, 2013
    Configuration menu
    Copy the full SHA
    3e1462d View commit details
    Browse the repository at this point in the history

  2. load tracks inside out

    @ywwg
    ywwg committed May 12, 2013
    Configuration menu
    Copy the full SHA
    e18d0ca View commit details
    Browse the repository at this point in the history

  3. m_rate_old needs to be based on resample_rate

    @ywwg
    ywwg committed May 12, 2013
    Configuration menu
    Copy the full SHA
    2575bbf View commit details
    Browse the repository at this point in the history

  4. remove old BPM analyser code, Fix Bug #1179038

    @ywwg
    Max Linke authored and ywwg committed May 12, 2013
    Configuration menu
    Copy the full SHA
    bd30d91 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into master_sync

    @ywwg
    ywwg committed May 12, 2013
    Configuration menu
    Copy the full SHA
    b95dce0 View commit details
    Browse the repository at this point in the history

  6. sync master slider with master deck 

    fix track loading for 2 deck and 4 deck
    @ywwg
    ywwg committed May 12, 2013
    Configuration menu
    Copy the full SHA
    430d940 View commit details
    Browse the repository at this point in the history

  7. fix segfault (check pointer != null) 

    move setcurrentsample, this helps keep things in sync (even without quantize!)
tweak setting master a bit
    @ywwg
    ywwg committed May 12, 2013
    Configuration menu
    Copy the full SHA
    6009fe3 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2013

  1. use [Skin] designation in other 4deck skin

    @ywwg
    ywwg committed May 13, 2013
    Configuration menu
    Copy the full SHA
    1b45bd1 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2013

  1. don't allow setting of master if no track loaded

    @ywwg
    ywwg committed May 14, 2013
    Configuration menu
    Copy the full SHA
    aa8975e View commit details
    Browse the repository at this point in the history

Commits on May 16, 2013

  1. Merge branch 'bzr-trunk' into master_sync 

    Conflicts:
	mixxx/src/engine/enginemaster.cpp
	mixxx/src/engine/loopingcontrol.cpp
	mixxx/src/mixxx.cpp
	mixxx/src/mixxx.h
    @ywwg
    ywwg committed May 16, 2013
    Configuration menu
    Copy the full SHA
    f30290f View commit details
    Browse the repository at this point in the history

  2. fix merge

    @ywwg
    ywwg committed May 16, 2013
    Configuration menu
    Copy the full SHA
    860417e View commit details
    Browse the repository at this point in the history

  3. small fixes, need two scripts for xone

    @ywwg
    ywwg committed May 16, 2013
    Configuration menu
    Copy the full SHA
    117407b View commit details
    Browse the repository at this point in the history

  4. bonehead typos 

    make vinyl override slave mode always
    @ywwg
    ywwg committed May 16, 2013
    Configuration menu
    Copy the full SHA
    f77a14d View commit details
    Browse the repository at this point in the history

  5. Merge branch 'atomic-co-rryan' into atomic-rryan-master 

    Conflicts:
	mixxx/src/engine/enginemaster.cpp
	mixxx/src/engine/enginemaster.h
	mixxx/src/engine/loopingcontrol.cpp
	mixxx/src/playermanager.cpp
	mixxx/src/playermanager.h
	mixxx/src/vinylcontrol/vinylcontrolmanager.cpp
    @ywwg
    ywwg committed May 16, 2013
    Configuration menu
    Copy the full SHA
    b5e511f View commit details
    Browse the repository at this point in the history

  6. fix build issues, delete excess files

    @ywwg
    ywwg committed May 16, 2013
    Configuration menu
    Copy the full SHA
    fea1efc View commit details
    Browse the repository at this point in the history

  7. cleanup

    @ywwg
    ywwg committed May 16, 2013
    Configuration menu
    Copy the full SHA
    ba97bf9 View commit details
    Browse the repository at this point in the history

Commits on May 18, 2013

  1. Merge remote-tracking branch 'mixxx/master' into atomic-rryan-master

    @ywwg
    ywwg committed May 18, 2013
    Configuration menu
    Copy the full SHA
    12f8467 View commit details
    Browse the repository at this point in the history