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

[WIP] Bars phrases and variable bpm in beats class #2512

Commits on Nov 6, 2019

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

Commits on Nov 20, 2019

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

Commits on Dec 9, 2019

  1. Added Signature class

    JaviVilarroig committed Dec 9, 2019
    Configuration menu
    Copy the full SHA
    dc8fbe7 View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2019

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

Commits on Dec 17, 2019

  1. Merge branch 'bars_phrases_and_variable_BPM_in_beats_class' of https:…

    …//github.com/JaviVilarroig/mixxx into bars_phrases_and_variable_BPM_in_beats_class
    JaviVilarroig committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    05a4720 View commit details
    Browse the repository at this point in the history
  2. Fix repo

    JaviVilarroig committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    2d38e75 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2019

  1. Merge remote-tracking branch 'upstream/master' into bars_phrases_and_…

    …variable_BPM_in_beats_class
    JaviVilarroig committed Dec 19, 2019
    Configuration menu
    Copy the full SHA
    c1428f0 View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2020

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

Commits on Jan 16, 2020

  1. BeatGrid/BeatMap Signature support

    Added support in BeatGrid and some minor fixes in BeatMap.
    JaviVilarroig committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    b2c9eca View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0084ddc View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2020

  1. - Added button in Tango skin for setting bar beat

    - Added Beats.setBar
    
    The skin work is just a placeholder. I'm not so good in design.
    JaviVilarroig committed Feb 17, 2020
    Configuration menu
    Copy the full SHA
    c8b8ae4 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2020

  1. Presentaion of Bar beats in Waveform for BeatMap.

    - Extended BeatIterator for Bar and Phrase(partial) support.
    - Extended BeatMap for Bar and Phrase(partial) management.
    - Waveformrendererbeat extended to include the definition of the bar
    beat color in the XML skin files.
    - Tango Skin modified to include a button for marking bar beats.
    JaviVilarroig committed Feb 22, 2020
    Configuration menu
    Copy the full SHA
    fa68e2d View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'upstream/master' into bars_phrases_and_…

    …variable_BPM_in_beats_class
    JaviVilarroig committed Feb 22, 2020
    Configuration menu
    Copy the full SHA
    87cc607 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2020

  1. Configuration menu
    Copy the full SHA
    01583e8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b533ac4 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2020

  1. Fixes in TimeSignature class.

    - Filename renamed to match class name
    - Property names improved
    - UItility constants renamed to fit variable coding rules
    JaviVilarroig committed Feb 26, 2020
    Configuration menu
    Copy the full SHA
    72e030a View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2020

  1. Configuration menu
    Copy the full SHA
    9d652ca View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    91c9930 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2020

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

Commits on Mar 5, 2020

  1. Multiple small fixes on Beats. Added default value to TimeSignature

    protobuff, improvement in some tooltips and name changes in some methods
    and properties.
    JaviVilarroig committed Mar 5, 2020
    Configuration menu
    Copy the full SHA
    26b358f View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2020

  1. BeatGrid removal and BeatMap consolidation into Beats

    - BeatMap functionality moved to Beats class
    - BeatGrid class removed
    - BeatsFactory only creates Beats
    - BeatGridTest removed
    - Beats class moved to mixxx namespace
    - Beats class uses frame number instead of sample number
      The original methods still exists. They transform sample into frames
      and call a method with the same name with "New" sufix. This is
      temporary until the rest of the code is adapted to use frames
    - BeatsTest adapted to new Beats class
    JaviVilarroig committed Apr 19, 2020
    Configuration menu
    Copy the full SHA
    f97cd1e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    48ec71b View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2020

  1. Merge remote-tracking branch 'upstream/master' into

    bars_phrases_and_variable_BPM_in_beats_class
    
    # Conflicts:
    #	.pre-commit-config.yaml
    #	src/engine/controls/bpmcontrol.h
    #	src/mixer/basetrackplayer.cpp
    #	src/test/beatgridtest.cpp
    #	src/test/beatmaptest.cpp
    #	src/test/enginesynctest.cpp
    #	src/track/beatgrid.cpp
    #	src/track/beatgrid.h
    #	src/track/beatmap.cpp
    #	src/track/beatmap.h
    #	src/track/track.cpp
    #	src/track/track.h
    #	src/widget/wtracktableview.cpp
    JaviVilarroig committed Apr 21, 2020
    Configuration menu
    Copy the full SHA
    58be257 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0532956 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9a31a12 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    3837563 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    18c8e9b View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2020

  1. Configuration menu
    Copy the full SHA
    ef8df26 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8930f78 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    41477ec View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    41eec7d View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    f5b1890 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    ca36f47 View commit details
    Browse the repository at this point in the history
  7. Merge branch 'bars_phrases_and_variable_BPM_in_beats_class' of github…

    ….com:JaviVilarroig/mixxx into bars_phrases_and_variable_BPM_in_beats_class
    JaviVilarroig committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    4102b23 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    5abf85b View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    89cf63c View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    a0e828f View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    b3d3701 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    15626d9 View commit details
    Browse the repository at this point in the history

Commits on May 4, 2020

  1. Fixes in BeatIterator

    - SIGSEV when using a BeatIterator created with a range outside the
    Beats
    - Last beat in was never reached
    JaviVilarroig committed May 4, 2020
    Configuration menu
    Copy the full SHA
    8abb3fb View commit details
    Browse the repository at this point in the history
  2. Remove obsolete tests

    JaviVilarroig committed May 4, 2020
    Configuration menu
    Copy the full SHA
    dec4d31 View commit details
    Browse the repository at this point in the history

Commits on May 5, 2020

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

Commits on May 6, 2020

  1. Configuration menu
    Copy the full SHA
    d0e4b12 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0f1848a View commit details
    Browse the repository at this point in the history

Commits on May 7, 2020

  1. Configuration menu
    Copy the full SHA
    bd57568 View commit details
    Browse the repository at this point in the history
  2. Change name of method toByteArray to toProtobuff

    This is a requested improvement to increase readability.
    JaviVilarroig committed May 7, 2020
    Configuration menu
    Copy the full SHA
    9ed4081 View commit details
    Browse the repository at this point in the history
  3. Fix in indentation

    JaviVilarroig committed May 7, 2020
    Configuration menu
    Copy the full SHA
    12cd34c View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    784e646 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2020

  1. Merge remote-tracking branch 'upstream/master' into

    bars_phrases_and_variable_BPM_in_beats_class
    
    # Conflicts:
    #	src/analyzer/analyzerbeats.cpp
    #	src/engine/controls/bpmcontrol.cpp
    #	src/engine/controls/bpmcontrol.h
    #	src/engine/controls/clockcontrol.cpp
    #	src/engine/controls/clockcontrol.h
    #	src/engine/controls/loopingcontrol.cpp
    #	src/engine/controls/quantizecontrol.cpp
    #	src/engine/controls/quantizecontrol.h
    #	src/library/banshee/bansheeplaylistmodel.cpp
    #	src/library/dao/trackdao.cpp
    #	src/library/rekordbox/rekordboxfeature.cpp
    #	src/mixer/basetrackplayer.cpp
    #	src/test/beatgridtest.cpp
    #	src/test/beatmaptest.cpp
    #	src/test/beatstranslatetest.cpp
    #	src/test/bpmcontrol_test.cpp
    #	src/test/enginesynctest.cpp
    #	src/track/beatfactory.cpp
    #	src/track/beatfactory.h
    #	src/track/beatgrid.cpp
    #	src/track/beatgrid.h
    #	src/track/beatmap.cpp
    #	src/track/beatmap.h
    #	src/track/beats.cpp
    #	src/track/beats.h
    #	src/track/track.cpp
    #	src/widget/wtrackmenu.cpp
    JaviVilarroig committed May 8, 2020
    Configuration menu
    Copy the full SHA
    1851baf View commit details
    Browse the repository at this point in the history

Commits on May 10, 2020

  1. BeatTrtanslateTest is now OK.

    Minor fixes in Beats.
    Improvements in BeatsTest
    Improvements on BeatTranslateTest
    JaviVilarroig committed May 10, 2020
    Configuration menu
    Copy the full SHA
    d5f73c4 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2020

  1. This makes beatmap behaves like a beatgrid when constant tempo prefer…

    …ence is true (#1)
    
    * fix scons build
    
    * beatmap behave like beatgrid when constant tempo preference is true
    
    Co-authored-by: Cristiano <cristiano.lacerda@usp.br>
    Co-authored-by: JaviVilarroig <43292281+JaviVilarroig@users.noreply.github.com>
    3 people authored May 13, 2020
    Configuration menu
    Copy the full SHA
    920d1c6 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2020

  1. Revert "This makes beatmap behaves like a beatgrid when constant temp…

    …o preference is true (#1)"
    
    This reverts commit 920d1c6.
    
    It introduces an issue in mixxx engine. We can continue working on this
    functionality in parallel.
    JaviVilarroig committed May 17, 2020
    Configuration menu
    Copy the full SHA
    b6be4dd View commit details
    Browse the repository at this point in the history

Commits on May 21, 2020

  1. Beats to use Bpm type

    - Changes in Beats to use Bpm
    - Changes in tests to use Bpm
    - Added some operators in Bpm
    JaviVilarroig committed May 21, 2020
    Configuration menu
    Copy the full SHA
    bfe8ab8 View commit details
    Browse the repository at this point in the history