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

Auto dj crates #18

Merged
merged 29 commits into from
Jul 16, 2013
Merged

Auto dj crates #18

merged 29 commits into from
Jul 16, 2013

Commits on May 4, 2013

  1. First version of auto-DJ crates. 

    I need some feedback on the GUI, but otherwise this feature should be ready for merging into the trunk!
    @ulatekh
    ulatekh committed May 4, 2013
    Configuration menu
    Copy the full SHA
    eb6d41b View commit details
    Browse the repository at this point in the history

Commits on May 10, 2013

  1. Just some minor changes to comments.

    @ulatekh
    ulatekh committed May 10, 2013
    Configuration menu
    Copy the full SHA
    638c8b7 View commit details
    Browse the repository at this point in the history

  2. Merged with trunk; minor updates to merge conflicting changes.

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

Commits on May 12, 2013

  1. Now the auto-DJ-crates table stores the last time the track was playe… 

    …d, and uses that to prioritize randomly-added tracks!

I thought the system didn't have that info...turns out it's stored as PlaylistTracks.pl_datetime_added for set-log playlists!

Also updated to latest trunk version.
    @ulatekh
    ulatekh committed May 12, 2013
    Configuration menu
    Copy the full SHA
    6a30eb3 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2013

  1. Merged with lp:mixxx

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

  2. Made the auto-DJ-crates feature subject to conditional compilation.

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

  3. Implemented an "Add crate" menu on the "Crates" tree-item in the "Aut… 

    …o DJ" feature.

One more convenient way to add a crate to the auto-DJ queue!
    @ulatekh
    ulatekh committed May 16, 2013
    Configuration menu
    Copy the full SHA
    417532a View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2013

  1. Changed "Add Crate to AutoDJ" to "Connect to AutoDJ", and "Remove Cra… 

    …te from AutoDJ" to "Disconnect from AutoDJ", and fixed curly-brace placement, per Daniel Schürmann's feedback.
    @ulatekh
    ulatekh committed Jun 3, 2013
    Configuration menu
    Copy the full SHA
    6e4f2f0 View commit details
    Browse the repository at this point in the history

  2. One more menu item needed updating -- "Add crate" is now "Connect Cra… 

    …te to AutoDJ".
    @ulatekh
    ulatekh committed Jun 3, 2013
    Configuration menu
    Copy the full SHA
    02bd977 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2013

  1. Merged with lp:mixxx

    @ulatekh
    ulatekh committed Jun 5, 2013
    Configuration menu
    Copy the full SHA
    dea693d View commit details
    Browse the repository at this point in the history

  2. Now random-tracks chosen by the auto-DJ-crates feature can be in term… 

    …s of how recently the track was played.
    @ulatekh
    ulatekh committed Jun 5, 2013
    Configuration menu
    Copy the full SHA
    f1a6d70 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2013

  1. Now auto-DJ-crates better handles situations where very few tracks ar… 

    …e available.
    @ulatekh
    ulatekh committed Jun 6, 2013
    Configuration menu
    Copy the full SHA
    9d34467 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2013

  1. One more change to low-track situations in auto-DJ-crates.

    @ulatekh
    ulatekh committed Jun 7, 2013
    Configuration menu
    Copy the full SHA
    1ed581f View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2013

  1. Merged with lp:mixxx 

    Added one word to auto-DJ-crates preferences text
    @ulatekh
    ulatekh committed Jun 9, 2013
    Configuration menu
    Copy the full SHA
    72cad18 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2013

  1. Merge branch 'master' into auto-dj-crates 

    Conflicts:
	mixxx/res/schema.xml
	mixxx/src/dlgprefcontrols.cpp
	mixxx/src/library/trackcollection.cpp
    @daschuer
    daschuer committed Jun 20, 2013
    Configuration menu
    Copy the full SHA
    8e03aa0 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2013

  1. Merge branch 'master' of https://github.com/mixxxdj/mixxx into auto-d… 

    …j-crates
    @ulatekh
    ulatekh committed Jun 22, 2013
    Configuration menu
    Copy the full SHA
    4a9ffe7 View commit details
    Browse the repository at this point in the history

  2. Fixed lots of formatting issues.

    @ulatekh
    ulatekh committed Jun 22, 2013
    Configuration menu
    Copy the full SHA
    60de69f View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2013

  1. Because early returns are completely different than gotos, and _so_ m… 

    …uch better...
    @ulatekh
    ulatekh committed Jun 23, 2013
    Configuration menu
    Copy the full SHA
    1bc835b View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2013

  1. Merge pull request #1 from ulatekh/auto-dj-crates 

    Auto dj crates
    @daschuer
    daschuer committed Jun 24, 2013
    Configuration menu
    Copy the full SHA
    5f63af5 View commit details
    Browse the repository at this point in the history

  2. allow not adding a track if no condition fits

    @daschuer
    daschuer committed Jun 24, 2013
    Configuration menu
    Copy the full SHA
    d9c096a View commit details
    Browse the repository at this point in the history

  3. unified wording, added tooltip for checkbox

    @daschuer
    daschuer committed Jun 24, 2013
    Configuration menu
    Copy the full SHA
    8df76eb View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2013

  1. Merge branch 'master' into autodj-crates2 

    Conflicts:
	src/dlgprefcontrolsdlg.ui
	src/library/dao/cratedao.cpp
	src/library/dao/cratedao.h
    @daschuer
    daschuer committed Jul 7, 2013
    Configuration menu
    Copy the full SHA
    6735fbc View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2013

  1. Merge branch 'master' into auto-dj-crates 

    Conflicts:
	src/library/cratefeature.cpp
	src/library/dao/cratedao.cpp
    @daschuer
    daschuer committed Jul 15, 2013
    Configuration menu
    Copy the full SHA
    d7cf2c1 View commit details
    Browse the repository at this point in the history

  2. Fixed issues from RJs comments; Made crates menu "Auto DJ Source" 

    checkable; Removed .arg() chains.
    @daschuer
    daschuer committed Jul 15, 2013
    Configuration menu
    Copy the full SHA
    b3743ef View commit details
    Browse the repository at this point in the history

  3. Changed context menu for crates in AutoDj tree

    @daschuer
    daschuer committed Jul 15, 2013
    Configuration menu
    Copy the full SHA
    0d7af53 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2013

  1. fixed auto dj crate tree population after restart

    @daschuer
    daschuer committed Jul 16, 2013
    Configuration menu
    Copy the full SHA
    41d1168 View commit details
    Browse the repository at this point in the history

  2. Fixed Dynamic deck count in auto dj crates. Removed use of QMap::[] in 

    PlayerInfo. Removed unusual prefix from some parameters.
    @daschuer
    daschuer committed Jul 16, 2013
    Configuration menu
    Copy the full SHA
    852546d View commit details
    Browse the repository at this point in the history

  3. Tweaked GUI strings for auto dj crates

    @daschuer
    daschuer committed Jul 16, 2013
    Configuration menu
    Copy the full SHA
    92bddf1 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into auto-dj-crates 

    Conflicts:
	build/features.py
    @daschuer
    daschuer committed Jul 16, 2013
    Configuration menu
    Copy the full SHA
    1c3df49 View commit details
    Browse the repository at this point in the history