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.

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

Cover art support 4 #3

Closed
wants to merge 49 commits into from
Closed

Cover art support 4 #3

wants to merge 49 commits into from

Commits on Jul 3, 2014

  1. Modified the playlist shuffling algorithm to avoid placing two instan…

    …ces of the same track next to each other. It checks the IDs of the tracks before and after the positions of the tracks that will be swapped, and if there's a match, it tries again with a new position.
    
    It tries a maximum of 10 times, which should be far more than enough for normal situations. It uses the PlaylistTracks table in the database to get its track ID numbers. I didn't notice any significant performance decreases, even with hundreds of the same 10-15 tracks in the AutoDJ playlist.
    zr3 committed Jul 3, 2014
    Configuration menu
    Copy the full SHA
    6274018 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2014

  1. Finished modified shuffling algorithm

    Here's a brief description of how the algorithm now works:
    Loop through the set of tracks to be shuffled:
        1) Set Track A as the current point in the shuffle set
        2) Repeat a maximum of 10 times or until a good place (1/4 of the
           playlist away from a conflict) is reached:
            a) Pick a random track within the shuffle set (Track B)
            b) Check 1/4 of the playlist up and down (clamped at the
               beginning and end) from Track B's position for Track A
            c) Check 1/4 of the playlist up and down (clamped at the
               beginning and end) from Track A's position for Track B
            d) If there was a conflict, store the position if it was better
               than the already stored best position. The position is deemed
               "better" if the distance (square of the difference) of
               the closest conflict (Track B near Track A's position and vv)
               is larger than previous iterations.
    3) If no good place was found, use the stored best position
    4) Swap Track A and Track B
    
    The "tempTrackDistance" variable in the following might be confusing:
    ...
                for (int count=startPosition; count < endPosition; count++) {
                    if (trackPositionIds.value(count) == trackBId && count != trackBPosition) {
                        conflictFound = true;
                        int tempTrackDistance =
                            (trackAPosition - count) * (trackAPosition - count);
                        if (tempTrackDistance < trackDistance || trackDistance == -1)
                            trackDistance = tempTrackDistance;
                    }
                }
    ...
    The reason it is there is to prevent a longer distance from being saved in
    the case that there are multiple conflicts within the range.
    
    The section of code that checks around Track A's and Track B's position is
    repetitive; I chose to leave it that way for clarity for now but perhaps
    it would be better to extract it into a private function?
    
    I have also renamed a few variables and fixed some comment typos for clarity.
    zr3 committed Jul 6, 2014
    Configuration menu
    Copy the full SHA
    0b0cf70 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2014

  1. Tidied up code

    Made a few changes to match the coding guidelines for Mixxx.
    zr3 committed Jul 11, 2014
    Configuration menu
    Copy the full SHA
    4b00a97 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2014

  1. Configuration menu
    Copy the full SHA
    8a5b684 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2014

  1. Configuration menu
    Copy the full SHA
    814aa98 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0a8b511 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    e6502aa View commit details
    Browse the repository at this point in the history
  4. Searching covers in the Last.fm database - initial implementation (ju…

    …st getting cover_urls)
    cardinot committed Jul 25, 2014
    Configuration menu
    Copy the full SHA
    10f0a8e View commit details
    Browse the repository at this point in the history
  5. Revert "Add Last.fm dependence (liblastfm)"

    This reverts commit 814aa98.
    cardinot committed Jul 25, 2014
    Configuration menu
    Copy the full SHA
    dd73d12 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2014

  1. Configuration menu
    Copy the full SHA
    1b5ef0c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    702250d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b1fbc1d View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    5753987 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    bc2b640 View commit details
    Browse the repository at this point in the history
  6. setting up coverView

    cardinot committed Jul 26, 2014
    Configuration menu
    Copy the full SHA
    4c0365b View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    e9af59b View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    6eb8e00 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    6796f13 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    c324729 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2014

  1. Removing unused members

    cardinot committed Jul 27, 2014
    Configuration menu
    Copy the full SHA
    47487bb View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    32f65d3 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4c9ed82 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    61f1070 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    5627e3d View commit details
    Browse the repository at this point in the history
  6. Improving management of the cover search results

    - the last logic to handle the results was too complex...
    cardinot committed Jul 27, 2014
    Configuration menu
    Copy the full SHA
    ac1f426 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    1de1bae View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    6e2369a View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    fe0de63 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2014

  1. Configuration menu
    Copy the full SHA
    b5ec417 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2014

  1. Configuration menu
    Copy the full SHA
    7d6f93b View commit details
    Browse the repository at this point in the history
  2. Uptading DlgTrackinfo + DlgCoverFetcher + DlgTagFetcher together afte…

    …r hit PREV or NEXT buttons
    
    It avoids the bug #1349017
    cardinot committed Jul 29, 2014
    Configuration menu
    Copy the full SHA
    546ee62 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2014

  1. Configuration menu
    Copy the full SHA
    27248d8 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2014

  1. Completed improved shuffling algorithm

    The algorithm now "wraps" around the playlist, so that if the tracks are re-queued they will still be 1/4 of the playlist apart.
    The most extreme case that this algorithm can now handle is a 4-track playlist with two copies of one of the tracks.
    zr3 committed Jul 31, 2014
    Configuration menu
    Copy the full SHA
    16f0ab3 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2014

  1. Configuration menu
    Copy the full SHA
    8fc3f7b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    96a3d44 View commit details
    Browse the repository at this point in the history
  3. dlgcoverfetcher - add button to apply modifications (just UI)

    I realized that firstly I need to improve the tableview and then make the slot work properly...
    Anyway, let's leave it done...
    cardinot committed Aug 1, 2014
    Configuration menu
    Copy the full SHA
    a347052 View commit details
    Browse the repository at this point in the history
  4. Minor style fixes

    zr3 committed Aug 1, 2014
    Configuration menu
    Copy the full SHA
    93ca2dd View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2014

  1. Configuration menu
    Copy the full SHA
    596cf4e View commit details
    Browse the repository at this point in the history
  2. Pull latest translations from https://www.transifex.com/projects/p/mi…

    …xxxdj/. Compile QM files out of TS files that are used by the localized app.
    esbrandt committed Aug 2, 2014
    Configuration menu
    Copy the full SHA
    5e29298 View commit details
    Browse the repository at this point in the history
  3. Update README.md

    Add links to Mixxx translation services
    esbrandt committed Aug 2, 2014
    Configuration menu
    Copy the full SHA
    169c8f1 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2014

  1. Configuration menu
    Copy the full SHA
    c8e7143 View commit details
    Browse the repository at this point in the history
  2. Merge pull request mixxxdj#300 from badescunicu/search_log

    Search Functionality to Developer's Log
    daschuer committed Aug 3, 2014
    Configuration menu
    Copy the full SHA
    c5942e7 View commit details
    Browse the repository at this point in the history
  3. Merge pull request mixxxdj#287 from zak-reynolds/master

    Fix for Bug #1023804: Stop AutoDJ shuffle from putting two of the same song together
    daschuer committed Aug 3, 2014
    Configuration menu
    Copy the full SHA
    a75da7e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    6e5bc2d View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2014

  1. Merge pull request #1 from cardinot/coverArtSupport_2

    Cover art support 2
    cardinot committed Aug 4, 2014
    Configuration menu
    Copy the full SHA
    8ee4974 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #2 from cardinot/coverArtSupport_3

    Cover art support 3
    cardinot committed Aug 4, 2014
    Configuration menu
    Copy the full SHA
    e17ae9b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    548d53f View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    0d6f527 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    b28cf6c View commit details
    Browse the repository at this point in the history