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 #10

Merged
merged 894 commits into from
Dec 13, 2013
Merged

Master sync #10

merged 894 commits into from
Dec 13, 2013

Conversation

ywwg
Copy link
Member

@ywwg ywwg commented Jun 12, 2013

Add support for realtime, allthetime, synchronization of tracks, samplers, etc.
Skins for trying out master sync can be found here:
https://github.com/ywwg/mixxx/tree/mastersync_skins

ywwg and others added 30 commits May 6, 2013 19:04
@ywwg
Clean commit with just my 1080p Hi DPI skins
9ccb8fc
@ywwg
added master and slave assets
f92df45
@ywwg
Merge branch 'DJO_t-biggerskin' into master_sync
7debdf8 
Conflicts:
	mixxx/res/skins/LateNight1280x800-4Deck-WXGA/skin.xml
@ywwg
fix problem with filebpm not getting initialized
2cfeb2e 
added debug numbers to skin
@ywwg
qtcreator made these I think
5dd4f10
@ywwg
Clean patch for master_sync
b087abe
@ywwg
Respond to review notes.
39f96a6
@ywwg
possibly wrong fix for locking issue, remove script since it always c…
d8995b5 
…hanges

Conflicts:
	mixxx/res/controllers/Xone-K2-scripts.js
@ywwg
include high dpi skins
d4e4c7b
@ywwg
Merge branch 'master' into master_sync_clean
ad8908e 
Conflicts:
	mixxx/src/dlgprefvinyl.cpp
	mixxx/src/mixxx.cpp
	mixxx/src/vinylcontrol/vinylcontrolmanager.cpp
@ywwg
Add decks three and four to vc manager
b64ea59
@ywwg
should be zero-based
e5995be
@ywwg
add all four decks
0965372
@ywwg
Merge branch 'master' into master_sync_clean
238b68c
@ywwg
Merge branch 'master' into master_sync_clean
10dd42c
@ywwg
no, maximum vinyl inputs 4!
3ad9c08
@ywwg
Merge branch 'master' into master_sync_clean
4ed33de 
Conflicts:
	mixxx/src/engine/bpmcontrol.cpp
	mixxx/src/engine/enginebuffer.cpp
@ywwg
Fixes for master/slave lights not behaving
75f595b
@ywwg
Fix midi lights not staying in sync
a1114df 
Change xone configuration for master sync mode
@ywwg
Fix vinyl input toggling not working correctly
4d294d2
@rryan
Fix return type in TwoWayMessagePipe.
362da17
@rryan
Check for NULL before TrackPointer deref.
35f0dac
@rryan
Merging from lp:mixxx.
080ecd3
@ywwg
Brute-force importing of master_sync work done in github.
3cff425
@rryan
Fix a merge issue.
1833d61
@rryan
Be explicit about position in calls to getPhaseOffset.
85f8181
@rryan
Minor logic cleanup in BpmControl.
13d4bc3
@rryan
Remove redundant initialization of m_iSyncState.
6ce7da7
@rryan
Use control itself for looking up VC-enabled and sync-state.
cc91af6
@rryan
Move rate-change sync logic out of EngineBuffer and into BpmControl.
985c681
@uklotzde uklotzde mentioned this pull request Jul 12, 2014
Merged
@daschuer daschuer mentioned this pull request Dec 28, 2014
Merged
@daschuer daschuer mentioned this pull request Jan 8, 2015
Merged
@rryan rryan deleted the master_sync branch April 22, 2015 14:35
@uklotzde uklotzde mentioned this pull request Jul 21, 2015
Merged
ywwg pushed a commit that referenced this pull request Oct 28, 2015
@illuusio
Merge pull request #10 from daschuer/1.12-shoutcast-fixes
cef330c 
Fix Apple time base
rryan added a commit that referenced this pull request Apr 9, 2016
@rryan
Merge pull request #10 from kain88-de/battery_clean
8f2c7af 
add battery information for windows
@daschuer daschuer mentioned this pull request Aug 13, 2017
Merged
19 tasks
daschuer pushed a commit that referenced this pull request Oct 3, 2017
@Be-ing
Merge pull request #10 from daschuer/autopan_improvements
2378361 
Autopan improvements
@daschuer daschuer mentioned this pull request Jun 11, 2018
Closed
11 tasks
@daschuer daschuer mentioned this pull request Aug 19, 2018
Closed
@uklotzde uklotzde mentioned this pull request Jan 16, 2020
Merged
Holzhaus referenced this pull request in Holzhaus/mixxx Apr 9, 2020
@ferranpujolcamins
Merge pull request #10 from dszakallas/upgrade-lp
f2610e3 
update Novation Launchpad controller scripts
Holzhaus referenced this pull request in Holzhaus/mixxx Aug 23, 2020
@esbrandt
Add info on Shoutcast metadata format and dynamic Ogg metadata update, …
f1c4ca5 
…fixes #10
daschuer pushed a commit that referenced this pull request Dec 28, 2020
@ywwg
Merge pull request #10 from uklotzde/last-played-squashed
57ac9c8 
Fix reading/writing of library.last_played_at
ywwg pushed a commit that referenced this pull request Mar 7, 2022
@Holzhaus
EngineBuffer: Fix assert when new track is loaded during playback wit…
9614a8f 
…h sync

When loading a track that is not yet present in the library (and thus
doesn't have any BPM because it hasn't been analyzed yet) while another
deck is playing and both decks have sync enabled, a debug assertion is
triggered:

    DEBUG ASSERT: "isValid()" in function double mixxx::Bpm::value() const at src/track/bpm.h:53
    Aborted (core dumped)

The backtrace looks as follows:

    #0  0x00007f175c87234c in __pthread_kill_implementation () at /usr/lib/libc.so.6
    #1  0x00007f175c8254b8 in raise () at /usr/lib/libc.so.6
    #2  0x00007f175c80f534 in abort () at /usr/lib/libc.so.6
    #3  0x00007f175cf05ee4 in qt_assert(char const*, char const*, int) () at /usr/lib/libQt5Core.so.5
    #4  0x000055deb2e67e1c in mixxx::(anonymous namespace)::handleMessage(QtMsgType, QMessageLogContext const&, QString const&) (type=<optimized out>, context=<optimized out>, input=<optimized out>) at src/util/logging.cpp:355
    #5  0x00007f175cf47128 in  () at /usr/lib/libQt5Core.so.5
    #6  0x00007f175cf3fd8a in  () at /usr/lib/libQt5Core.so.5
    #7  0x00007f175cf06526 in QMessageLogger::critical(char const*, ...) const () at /usr/lib/libQt5Core.so.5
    #8  0x000055deb2e5c720 in mixxx_debug_assert(char const*, char const*, int, char const*) (assertion=assertion@entry=0x55deb39bd0db "isValid()", file=file@entry=0x55deb39bbf30 "src/track/bpm.h", line=line@entry=53, function=function@entry=0x55deb39bbf08 "double mixxx::Bpm::value() const") at gsrc/util/assert.h:9
    #9  0x000055deb2ee7e7e in mixxx_debug_assert_return_true(char const*, char const*, int, char const*) (function=0x55deb39bbf08 "double mixxx::Bpm::value() const", line=53, file=0x55deb39bbf30 "src/track/bpm.h", assertion=0x55deb39bd0db "isValid()") at gsrc/util/assert.h:18
    #10 mixxx::Bpm::value() const (this=<synthetic pointer>) at src/track/bpm.h:53
    #11 mixxx::operator*(mixxx::Bpm, double) (multiple=1, bpm=...) at src/track/bpm.h:160
    #12 SyncControl::setLocalBpm(mixxx::Bpm) (this=<optimized out>, localBpm=...) at src/engine/sync/synccontrol.cpp:567
    #13 0x000055deb34c7ba3 in EngineBuffer::postProcess(int) (this=0x55deb56eb060, iBufferSize=2048) at src/engine/enginebuffer.cpp:1318
    #14 0x000055deb3139023 in EngineMaster::processChannels(int) (this=0x55deb5449440, iBufferSize=<optimized out>) at src/engine/enginemaster.cpp:383
    #15 0x000055deb31394f7 in EngineMaster::process(int) (this=0x55deb5449440, iBufferSize=iBufferSize@entry=2048) at src/engine/enginemaster.cpp:410
    #16 0x000055deb2f91d0b in SoundManager::onDeviceOutputCallback(long) (this=<optimized out>, iFramesPerBuffer=iFramesPerBuffer@entry=1024) at src/soundio/soundmanager.cpp:596
    #17 0x000055deb32dd794 in SoundDevicePortAudio::callbackProcessClkRef(long, float*, float const*, PaStreamCallbackTimeInfo const*, unsigned long) (this=0x55deb553e6b0, framesPerBuffer=1024, out=<optimized out>, in=<optimized out>, timeInfo=<optimized out>, statusFlags=<optimized out>) at src/soundio/sounddeviceportaudio.cpp:965

This happens because `newLocalBpm` is invalid when `localBpm` is
invalid. Trying to do sync decks while no tempo information is available
does not make sense, so we only synchronize decks if the local BPM is
available.
@ronso0 ronso0 mentioned this pull request Sep 4, 2022
Merged
@ronso0 ronso0 mentioned this pull request Sep 13, 2022
Merged
@nPrevail nPrevail mentioned this pull request Feb 16, 2023
Open
@ronso0 ronso0 mentioned this pull request May 9, 2023
Merged
@Swiftb0y Swiftb0y mentioned this pull request Aug 7, 2023
Closed
m0dB referenced this pull request in m0dB/mixxx Jan 21, 2024
@Be-ing
more imperative action verbs
11e10c5 
and address daschuer's comments on PR #10
m0dB referenced this pull request in m0dB/mixxx Jan 21, 2024
@Be-ing
respond to review comments on PR #10
8f375c5
m0dB referenced this pull request in m0dB/mixxx Jan 21, 2024
@Be-ing
Merge pull request #10 from Be-ing/features_rewrite
263776c 
Features page rewrite
@Frotus Frotus mentioned this pull request Jan 27, 2024
Open
@acolombier acolombier mentioned this pull request May 22, 2024
Open
@m0dB m0dB mentioned this pull request Nov 10, 2024
Open
acolombier pushed a commit to acolombier/mixxx that referenced this pull request Dec 1, 2024
@m0dB
Merge pull request mixxxdj#10 from acolombier/rendergraph-reduce-delta
51bf675 
Move back local classes in the private namespace
acolombier added a commit to acolombier/mixxx that referenced this pull request Dec 1, 2024
@acolombier
Squashed commit of the following:
7d7de2d 
commit d424088
Author: Antoine C <mixxx@acolombier.dev>
Date:   Sun Dec 1 22:46:19 2024 +0000

    fixup! feat: add scrolling waveform in QML using scenegraph

commit ad11a74
Author: Antoine C <mixxx@acolombier.dev>
Date:   Sun Dec 1 22:27:35 2024 +0000

    fixup! feat: add scrolling waveform in QML using scenegraph

commit a59fe88
Author: Antoine C <mixxx@acolombier.dev>
Date:   Tue Oct 22 23:45:01 2024 +0100

    feat: add scrolling waveform in QML using scenegraph

commit 72f0a0b
Author: m0dB <m0dB@mixxx.org>
Date:   Tue Oct 22 23:44:25 2024 +0100

    scrolling qml waveformdisplay working

commit 6aae89b
Author: Antoine C <mixxx@acolombier.dev>
Date:   Mon Oct 21 23:31:12 2024 +0100

    fix: prevent use-after-free with a texture buffer deepcopy

commit 368776d
Author: m0dB <m0dB@mixxx.org>
Date:   Sun Dec 1 20:47:41 2024 +0100

    draw rounded to pixel

commit b27ab9a
Author: m0dB <m0dB@mixxx.org>
Date:   Sat Nov 30 19:12:21 2024 +0100

    improve alignment of markers, avoid images that are half empty

commit ebc1108
Author: m0dB <m0dB@mixxx.org>
Date:   Sat Nov 30 17:37:14 2024 +0100

    minor changes to fix compilation

commit 51bf675
Merge: f409455 42a53d1
Author: m0dB <79429057+m0dB@users.noreply.github.com>
Date:   Sat Nov 30 17:26:12 2024 +0100

    Merge pull request mixxxdj#10 from acolombier/rendergraph-reduce-delta

    Move back local classes in the private namespace

commit 42a53d1
Author: Antoine C <mixxx@acolombier.dev>
Date:   Sat Nov 23 17:35:39 2024 +0000

    Round texture coordinate to prevent glitch

commit 709f8ca
Author: Antoine C <mixxx@acolombier.dev>
Date:   Sat Nov 23 12:39:43 2024 +0000

    Move back local classes in the private namespace

commit f409455
Author: m0dB <m0dB@mixxx.org>
Date:   Sat Nov 2 15:19:53 2024 +0100

    reduce delta with qml-rendergraph-fixes

commit c7a3c7a
Author: m0dB <m0dB@mixxx.org>
Date:   Sat Nov 2 15:10:36 2024 +0100

    use std::erase

commit a57b823
Author: m0dB <m0dB@mixxx.org>
Date:   Sat Nov 2 15:03:10 2024 +0100

    cleanup and comments

commit 8b25d13
Author: m0dB <m0dB@mixxx.org>
Date:   Sat Nov 2 15:02:43 2024 +0100

    improved attributeset from niko

commit c2d6c44
Author: m0dB <m0dB@mixxx.org>
Date:   Sat Nov 2 14:41:45 2024 +0100

    various cleanup, acting on review

commit d12d463
Author: m0dB <m0dB@mixxx.org>
Date:   Sat Nov 2 13:48:00 2024 +0100

    typo

commit 2de8ded
Author: m0dB <m0dB@mixxx.org>
Date:   Fri Nov 1 20:44:05 2024 +0100

    missing file

commit 3c76b1b
Author: m0dB <m0dB@mixxx.org>
Date:   Fri Nov 1 20:42:09 2024 +0100

    merge changes from acolombier, clear and set owned by parent flag, more clear transfer of waveformrendermarknode

commit b8f2268
Author: m0dB <m0dB@mixxx.org>
Date:   Sun Oct 20 23:11:19 2024 +0200

    some cleanup

commit 5220b39
Author: m0dB <m0dB@mixxx.org>
Date:   Sun Oct 20 21:18:05 2024 +0200

    reduced delta with feat/qml-scrolling-waveform-with-sg-and-rendergraph

commit cf17f15
Author: m0dB <m0dB@mixxx.org>
Date:   Sun Oct 20 21:02:42 2024 +0200

    reduce delta with feat/qml-scrolling-waveform-with-sg-and-rendergraph

commit 1a38137
Author: m0dB <m0dB@mixxx.org>
Date:   Sun Oct 20 21:01:57 2024 +0200

    reduce delta with feat/qml-scrolling-waveform-with-sg-and-rendergraph

commit 6b2442d
Author: m0dB <m0dB@mixxx.org>
Date:   Sun Oct 20 20:50:56 2024 +0200

    add nodeinterface for unique_ptr ownership methods

commit 8011f61
Author: m0dB <m0dB@mixxx.org>
Date:   Sun Oct 20 18:10:13 2024 +0200

    remove treenode

commit 1e57aae
Author: m0dB <m0dB@mixxx.org>
Date:   Sat Oct 19 04:15:45 2024 +0200

    let matrix be handled by qt scenegraph or by the opengl engine, removed engine class from scenegraph, get context from m_waveformRenderer, various cleanups

commit bf7ed15
Author: m0dB <m0dB@mixxx.org>
Date:   Sun Oct 6 04:08:29 2024 +0200

    wip

commit ca5f780
Author: m0dB <m0dB@mixxx.org>
Date:   Fri Sep 27 23:24:40 2024 +0200

    also use rendergraph::Engine in scenegraph to initialize and resize nodes, add GeometryNode::markDirtyGeometry() and GeometryNode::markDirtyMaterial()

commit 1f10725
Author: m0dB <m0dB@mixxx.org>
Date:   Fri Sep 27 22:26:47 2024 +0200

    remove generated file

commit 941f0cc
Author: m0dB <m0dB@mixxx.org>
Date:   Wed Sep 25 11:02:32 2024 +0200

    put rendergraph_sg and rendergraph_gl in different namespaces

commit 0e870dd
Author: m0dB <m0dB@mixxx.org>
Date:   Tue Sep 24 19:01:02 2024 +0200

    comment

commit b817d6c
Author: m0dB <m0dB@mixxx.org>
Date:   Tue Sep 24 18:55:08 2024 +0200

    removed class Attribute and use BaseGeometry::Attribute to reduce delta between opengl and scenegraph

commit b24e9ba
Author: m0dB <m0dB@mixxx.org>
Date:   Mon Sep 23 16:33:50 2024 +0200

    ported waveformrendererrgb to rendergraph, hurray!

commit 07d1f6a
Author: m0dB <m0dB@mixxx.org>
Date:   Mon Sep 23 16:32:53 2024 +0200

    moved vertexupdaters

commit 8e5128f
Author: m0dB <m0dB@mixxx.org>
Date:   Mon Sep 23 16:24:18 2024 +0200

    moved rendergraph::OpenGLNode to derived

commit 92cd753
Author: m0dB <m0dB@mixxx.org>
Date:   Mon Sep 23 16:22:57 2024 +0200

    fix typo

commit c6cdb34
Author: m0dB <m0dB@mixxx.org>
Date:   Mon Sep 23 15:38:05 2024 +0200

    moved opengl node as baseclass for waveform renderers to derived class, so i can start porting some to geometrynode

commit 2f8e548
Author: m0dB <m0dB@mixxx.org>
Date:   Mon Sep 23 15:23:08 2024 +0200

    improved/added asserts

commit 9c607c1
Author: m0dB <m0dB@mixxx.org>
Date:   Mon Sep 23 01:44:47 2024 +0200

    updated READMEs

commit 0a691ad
Author: m0dB <m0dB@mixxx.org>
Date:   Mon Sep 23 01:37:01 2024 +0200

    avoid adding entire src dir to include paths

commit eeae3ea
Author: m0dB <m0dB@mixxx.org>
Date:   Mon Sep 23 01:36:19 2024 +0200

    use qshader to load qsb files for opengl Qt >= 6.6

commit bc32a9c
Author: m0dB <m0dB@mixxx.org>
Date:   Sun Sep 22 21:50:24 2024 +0200

    use string literal

commit 86e5f09
Author: m0dB <m0dB@mixxx.org>
Date:   Sun Sep 22 21:43:21 2024 +0200

    added some DEBUG_ASSERTs and some vector.reserve calls

commit ec3f816
Author: m0dB <m0dB@mixxx.org>
Date:   Sun Sep 22 20:35:01 2024 +0200

    use a generic Material::compare

commit c5444fc
Author: m0dB <m0dB@mixxx.org>
Date:   Sun Sep 22 19:06:27 2024 +0200

    added comment to explain return value of remove node functions

commit 2a4a7d1
Author: m0dB <m0dB@mixxx.org>
Date:   Sun Sep 22 18:57:19 2024 +0200

    removed backend:: namespace, minor changes based on reviews

commit 6ebc9d5
Author: m0dB <m0dB@mixxx.org>
Date:   Sun Sep 22 13:18:47 2024 +0200

    removed accidental commit

commit c713d6a
Author: m0dB <79429057+m0dB@users.noreply.github.com>
Date:   Sun Sep 22 14:30:12 2024 +0200

    Update src/rendergraph/common/rendergraph/attribute.h

    simplify attribute constructor.

    Co-authored-by: Swiftb0y <12380386+Swiftb0y@users.noreply.github.com>

commit dff3a31
Author: m0dB <79429057+m0dB@users.noreply.github.com>
Date:   Sun Sep 22 13:20:07 2024 +0200

    Update src/rendergraph/opengl/backend/shadercache.h

    direct conversion from unique_ptr to shader_ptr

    Co-authored-by: Swiftb0y <12380386+Swiftb0y@users.noreply.github.com>

commit afdc0ed
Author: m0dB <79429057+m0dB@users.noreply.github.com>
Date:   Sun Sep 22 13:15:42 2024 +0200

    Update res/shaders/rendergraph/unicolor.frag

    Co-authored-by: Swiftb0y <12380386+Swiftb0y@users.noreply.github.com>

commit 390dd0e
Author: m0dB <79429057+m0dB@users.noreply.github.com>
Date:   Sun Sep 22 12:49:28 2024 +0200

    Update src/rendergraph/common/rendergraph/material/rgbamaterial.cpp

    Co-authored-by: Daniel Schürmann <daschuer@mixxx.org>

commit 319ffb0
Author: m0dB <79429057+m0dB@users.noreply.github.com>
Date:   Sun Sep 22 12:49:06 2024 +0200

    Update src/rendergraph/common/rendergraph/material/patternmaterial.h

    un-name unused argument

    Co-authored-by: Swiftb0y <12380386+Swiftb0y@users.noreply.github.com>

commit b8bcb19
Author: m0dB <m0dB@mixxx.org>
Date:   Thu Sep 19 19:13:52 2024 +0200

    reorganized the code, with a public common API that is derived from the opengl or the scenegraph backend.

commit 88013d4
Author: m0dB <m0dB@mixxx.org>
Date:   Thu Sep 19 12:57:46 2024 +0200

    remove nodebase, use encapsulation for scenegraph Node

commit 1967817
Author: m0dB <m0dB@mixxx.org>
Date:   Thu Sep 19 01:58:57 2024 +0200

    cleanup and moved common rendergraph files to common/rendergraph

commit 18fa2c4
Author: m0dB <m0dB@mixxx.org>
Date:   Thu Sep 19 00:42:46 2024 +0200

    removed pimpl from rendergraph scenegraph

commit a0df59e
Author: m0dB <m0dB@mixxx.org>
Date:   Sun Sep 1 20:51:08 2024 +0200

    removed pimpl from rendergraph opengl

commit 507a465
Author: m0dB <m0dB@mixxx.org>
Date:   Sat Aug 31 22:43:26 2024 +0200

    draw marks with rendergraph

commit 3dcf907
Author: m0dB <m0dB@mixxx.org>
Date:   Sat Aug 31 17:04:21 2024 +0200

    digitsrenderer with rendergraph

commit 8032b38
Author: m0dB <m0dB@mixxx.org>
Date:   Sat Aug 31 16:24:15 2024 +0200

    keep track of material that modified the shader uniforms, fix scenegraph

commit 058f5ec
Author: m0dB <m0dB@mixxx.org>
Date:   Sat Aug 31 15:23:32 2024 +0200

    reuse materialshaders

commit 1e4d04b
Author: m0dB <m0dB@mixxx.org>
Date:   Sat Aug 31 13:49:14 2024 +0200

    draw playpos with rendergraph

commit 9eb2938
Author: m0dB <m0dB@mixxx.org>
Date:   Sat Aug 31 12:41:29 2024 +0200

    towards digits renderer as node

commit 9a01213
Author: m0dB <m0dB@mixxx.org>
Date:   Sat Aug 31 12:18:42 2024 +0200

    make linked list handling part of rendergraph::Node

commit 8014163
Author: m0dB <m0dB@mixxx.org>
Date:   Sat Aug 31 03:58:14 2024 +0200

    mark range with dynamic nodes

commit 1dc16a5
Author: m0dB <m0dB@mixxx.org>
Date:   Sat Aug 31 01:48:10 2024 +0200

    fix teardown order

commit 4ad583c
Author: m0dB <m0dB@mixxx.org>
Date:   Sat Aug 31 01:25:58 2024 +0200

    node iterator, fixed examples

commit c2fffea
Author: m0dB <m0dB@mixxx.org>
Date:   Fri Aug 30 23:28:11 2024 +0200

    preroll/postroll using rendergraph

commit d3a69bb
Author: m0dB <m0dB@mixxx.org>
Date:   Tue Aug 27 11:31:01 2024 +0200

    waveformrenderbeat with rendergraph, various fixes, use same shaders and material for mixxx and rendergraph examples

commit 280fcf7
Author: m0dB <m0dB@mixxx.org>
Date:   Fri Aug 23 20:46:13 2024 +0200

    using rendergraph for allshader waveforms, with rendergraph::GeometryNode for end of track
acolombier added a commit to acolombier/mixxx that referenced this pull request Dec 3, 2024
@acolombier
Squashed commit of the following:
67571c7 
commit d424088
Author: Antoine C <mixxx@acolombier.dev>
Date:   Sun Dec 1 22:46:19 2024 +0000

    fixup! feat: add scrolling waveform in QML using scenegraph

commit ad11a74
Author: Antoine C <mixxx@acolombier.dev>
Date:   Sun Dec 1 22:27:35 2024 +0000

    fixup! feat: add scrolling waveform in QML using scenegraph

commit a59fe88
Author: Antoine C <mixxx@acolombier.dev>
Date:   Tue Oct 22 23:45:01 2024 +0100

    feat: add scrolling waveform in QML using scenegraph

commit 72f0a0b
Author: m0dB <m0dB@mixxx.org>
Date:   Tue Oct 22 23:44:25 2024 +0100

    scrolling qml waveformdisplay working

commit 6aae89b
Author: Antoine C <mixxx@acolombier.dev>
Date:   Mon Oct 21 23:31:12 2024 +0100

    fix: prevent use-after-free with a texture buffer deepcopy

commit 368776d
Author: m0dB <m0dB@mixxx.org>
Date:   Sun Dec 1 20:47:41 2024 +0100

    draw rounded to pixel

commit b27ab9a
Author: m0dB <m0dB@mixxx.org>
Date:   Sat Nov 30 19:12:21 2024 +0100

    improve alignment of markers, avoid images that are half empty

commit ebc1108
Author: m0dB <m0dB@mixxx.org>
Date:   Sat Nov 30 17:37:14 2024 +0100

    minor changes to fix compilation

commit 51bf675
Merge: f409455 42a53d1
Author: m0dB <79429057+m0dB@users.noreply.github.com>
Date:   Sat Nov 30 17:26:12 2024 +0100

    Merge pull request mixxxdj#10 from acolombier/rendergraph-reduce-delta

    Move back local classes in the private namespace

commit 42a53d1
Author: Antoine C <mixxx@acolombier.dev>
Date:   Sat Nov 23 17:35:39 2024 +0000

    Round texture coordinate to prevent glitch

commit 709f8ca
Author: Antoine C <mixxx@acolombier.dev>
Date:   Sat Nov 23 12:39:43 2024 +0000

    Move back local classes in the private namespace

commit f409455
Author: m0dB <m0dB@mixxx.org>
Date:   Sat Nov 2 15:19:53 2024 +0100

    reduce delta with qml-rendergraph-fixes

commit c7a3c7a
Author: m0dB <m0dB@mixxx.org>
Date:   Sat Nov 2 15:10:36 2024 +0100

    use std::erase

commit a57b823
Author: m0dB <m0dB@mixxx.org>
Date:   Sat Nov 2 15:03:10 2024 +0100

    cleanup and comments

commit 8b25d13
Author: m0dB <m0dB@mixxx.org>
Date:   Sat Nov 2 15:02:43 2024 +0100

    improved attributeset from niko

commit c2d6c44
Author: m0dB <m0dB@mixxx.org>
Date:   Sat Nov 2 14:41:45 2024 +0100

    various cleanup, acting on review

commit d12d463
Author: m0dB <m0dB@mixxx.org>
Date:   Sat Nov 2 13:48:00 2024 +0100

    typo

commit 2de8ded
Author: m0dB <m0dB@mixxx.org>
Date:   Fri Nov 1 20:44:05 2024 +0100

    missing file

commit 3c76b1b
Author: m0dB <m0dB@mixxx.org>
Date:   Fri Nov 1 20:42:09 2024 +0100

    merge changes from acolombier, clear and set owned by parent flag, more clear transfer of waveformrendermarknode

commit b8f2268
Author: m0dB <m0dB@mixxx.org>
Date:   Sun Oct 20 23:11:19 2024 +0200

    some cleanup

commit 5220b39
Author: m0dB <m0dB@mixxx.org>
Date:   Sun Oct 20 21:18:05 2024 +0200

    reduced delta with feat/qml-scrolling-waveform-with-sg-and-rendergraph

commit cf17f15
Author: m0dB <m0dB@mixxx.org>
Date:   Sun Oct 20 21:02:42 2024 +0200

    reduce delta with feat/qml-scrolling-waveform-with-sg-and-rendergraph

commit 1a38137
Author: m0dB <m0dB@mixxx.org>
Date:   Sun Oct 20 21:01:57 2024 +0200

    reduce delta with feat/qml-scrolling-waveform-with-sg-and-rendergraph

commit 6b2442d
Author: m0dB <m0dB@mixxx.org>
Date:   Sun Oct 20 20:50:56 2024 +0200

    add nodeinterface for unique_ptr ownership methods

commit 8011f61
Author: m0dB <m0dB@mixxx.org>
Date:   Sun Oct 20 18:10:13 2024 +0200

    remove treenode

commit 1e57aae
Author: m0dB <m0dB@mixxx.org>
Date:   Sat Oct 19 04:15:45 2024 +0200

    let matrix be handled by qt scenegraph or by the opengl engine, removed engine class from scenegraph, get context from m_waveformRenderer, various cleanups

commit bf7ed15
Author: m0dB <m0dB@mixxx.org>
Date:   Sun Oct 6 04:08:29 2024 +0200

    wip

commit ca5f780
Author: m0dB <m0dB@mixxx.org>
Date:   Fri Sep 27 23:24:40 2024 +0200

    also use rendergraph::Engine in scenegraph to initialize and resize nodes, add GeometryNode::markDirtyGeometry() and GeometryNode::markDirtyMaterial()

commit 1f10725
Author: m0dB <m0dB@mixxx.org>
Date:   Fri Sep 27 22:26:47 2024 +0200

    remove generated file

commit 941f0cc
Author: m0dB <m0dB@mixxx.org>
Date:   Wed Sep 25 11:02:32 2024 +0200

    put rendergraph_sg and rendergraph_gl in different namespaces

commit 0e870dd
Author: m0dB <m0dB@mixxx.org>
Date:   Tue Sep 24 19:01:02 2024 +0200

    comment

commit b817d6c
Author: m0dB <m0dB@mixxx.org>
Date:   Tue Sep 24 18:55:08 2024 +0200

    removed class Attribute and use BaseGeometry::Attribute to reduce delta between opengl and scenegraph

commit b24e9ba
Author: m0dB <m0dB@mixxx.org>
Date:   Mon Sep 23 16:33:50 2024 +0200

    ported waveformrendererrgb to rendergraph, hurray!

commit 07d1f6a
Author: m0dB <m0dB@mixxx.org>
Date:   Mon Sep 23 16:32:53 2024 +0200

    moved vertexupdaters

commit 8e5128f
Author: m0dB <m0dB@mixxx.org>
Date:   Mon Sep 23 16:24:18 2024 +0200

    moved rendergraph::OpenGLNode to derived

commit 92cd753
Author: m0dB <m0dB@mixxx.org>
Date:   Mon Sep 23 16:22:57 2024 +0200

    fix typo

commit c6cdb34
Author: m0dB <m0dB@mixxx.org>
Date:   Mon Sep 23 15:38:05 2024 +0200

    moved opengl node as baseclass for waveform renderers to derived class, so i can start porting some to geometrynode

commit 2f8e548
Author: m0dB <m0dB@mixxx.org>
Date:   Mon Sep 23 15:23:08 2024 +0200

    improved/added asserts

commit 9c607c1
Author: m0dB <m0dB@mixxx.org>
Date:   Mon Sep 23 01:44:47 2024 +0200

    updated READMEs

commit 0a691ad
Author: m0dB <m0dB@mixxx.org>
Date:   Mon Sep 23 01:37:01 2024 +0200

    avoid adding entire src dir to include paths

commit eeae3ea
Author: m0dB <m0dB@mixxx.org>
Date:   Mon Sep 23 01:36:19 2024 +0200

    use qshader to load qsb files for opengl Qt >= 6.6

commit bc32a9c
Author: m0dB <m0dB@mixxx.org>
Date:   Sun Sep 22 21:50:24 2024 +0200

    use string literal

commit 86e5f09
Author: m0dB <m0dB@mixxx.org>
Date:   Sun Sep 22 21:43:21 2024 +0200

    added some DEBUG_ASSERTs and some vector.reserve calls

commit ec3f816
Author: m0dB <m0dB@mixxx.org>
Date:   Sun Sep 22 20:35:01 2024 +0200

    use a generic Material::compare

commit c5444fc
Author: m0dB <m0dB@mixxx.org>
Date:   Sun Sep 22 19:06:27 2024 +0200

    added comment to explain return value of remove node functions

commit 2a4a7d1
Author: m0dB <m0dB@mixxx.org>
Date:   Sun Sep 22 18:57:19 2024 +0200

    removed backend:: namespace, minor changes based on reviews

commit 6ebc9d5
Author: m0dB <m0dB@mixxx.org>
Date:   Sun Sep 22 13:18:47 2024 +0200

    removed accidental commit

commit c713d6a
Author: m0dB <79429057+m0dB@users.noreply.github.com>
Date:   Sun Sep 22 14:30:12 2024 +0200

    Update src/rendergraph/common/rendergraph/attribute.h

    simplify attribute constructor.

    Co-authored-by: Swiftb0y <12380386+Swiftb0y@users.noreply.github.com>

commit dff3a31
Author: m0dB <79429057+m0dB@users.noreply.github.com>
Date:   Sun Sep 22 13:20:07 2024 +0200

    Update src/rendergraph/opengl/backend/shadercache.h

    direct conversion from unique_ptr to shader_ptr

    Co-authored-by: Swiftb0y <12380386+Swiftb0y@users.noreply.github.com>

commit afdc0ed
Author: m0dB <79429057+m0dB@users.noreply.github.com>
Date:   Sun Sep 22 13:15:42 2024 +0200

    Update res/shaders/rendergraph/unicolor.frag

    Co-authored-by: Swiftb0y <12380386+Swiftb0y@users.noreply.github.com>

commit 390dd0e
Author: m0dB <79429057+m0dB@users.noreply.github.com>
Date:   Sun Sep 22 12:49:28 2024 +0200

    Update src/rendergraph/common/rendergraph/material/rgbamaterial.cpp

    Co-authored-by: Daniel Schürmann <daschuer@mixxx.org>

commit 319ffb0
Author: m0dB <79429057+m0dB@users.noreply.github.com>
Date:   Sun Sep 22 12:49:06 2024 +0200

    Update src/rendergraph/common/rendergraph/material/patternmaterial.h

    un-name unused argument

    Co-authored-by: Swiftb0y <12380386+Swiftb0y@users.noreply.github.com>

commit b8bcb19
Author: m0dB <m0dB@mixxx.org>
Date:   Thu Sep 19 19:13:52 2024 +0200

    reorganized the code, with a public common API that is derived from the opengl or the scenegraph backend.

commit 88013d4
Author: m0dB <m0dB@mixxx.org>
Date:   Thu Sep 19 12:57:46 2024 +0200

    remove nodebase, use encapsulation for scenegraph Node

commit 1967817
Author: m0dB <m0dB@mixxx.org>
Date:   Thu Sep 19 01:58:57 2024 +0200

    cleanup and moved common rendergraph files to common/rendergraph

commit 18fa2c4
Author: m0dB <m0dB@mixxx.org>
Date:   Thu Sep 19 00:42:46 2024 +0200

    removed pimpl from rendergraph scenegraph

commit a0df59e
Author: m0dB <m0dB@mixxx.org>
Date:   Sun Sep 1 20:51:08 2024 +0200

    removed pimpl from rendergraph opengl

commit 507a465
Author: m0dB <m0dB@mixxx.org>
Date:   Sat Aug 31 22:43:26 2024 +0200

    draw marks with rendergraph

commit 3dcf907
Author: m0dB <m0dB@mixxx.org>
Date:   Sat Aug 31 17:04:21 2024 +0200

    digitsrenderer with rendergraph

commit 8032b38
Author: m0dB <m0dB@mixxx.org>
Date:   Sat Aug 31 16:24:15 2024 +0200

    keep track of material that modified the shader uniforms, fix scenegraph

commit 058f5ec
Author: m0dB <m0dB@mixxx.org>
Date:   Sat Aug 31 15:23:32 2024 +0200

    reuse materialshaders

commit 1e4d04b
Author: m0dB <m0dB@mixxx.org>
Date:   Sat Aug 31 13:49:14 2024 +0200

    draw playpos with rendergraph

commit 9eb2938
Author: m0dB <m0dB@mixxx.org>
Date:   Sat Aug 31 12:41:29 2024 +0200

    towards digits renderer as node

commit 9a01213
Author: m0dB <m0dB@mixxx.org>
Date:   Sat Aug 31 12:18:42 2024 +0200

    make linked list handling part of rendergraph::Node

commit 8014163
Author: m0dB <m0dB@mixxx.org>
Date:   Sat Aug 31 03:58:14 2024 +0200

    mark range with dynamic nodes

commit 1dc16a5
Author: m0dB <m0dB@mixxx.org>
Date:   Sat Aug 31 01:48:10 2024 +0200

    fix teardown order

commit 4ad583c
Author: m0dB <m0dB@mixxx.org>
Date:   Sat Aug 31 01:25:58 2024 +0200

    node iterator, fixed examples

commit c2fffea
Author: m0dB <m0dB@mixxx.org>
Date:   Fri Aug 30 23:28:11 2024 +0200

    preroll/postroll using rendergraph

commit d3a69bb
Author: m0dB <m0dB@mixxx.org>
Date:   Tue Aug 27 11:31:01 2024 +0200

    waveformrenderbeat with rendergraph, various fixes, use same shaders and material for mixxx and rendergraph examples

commit 280fcf7
Author: m0dB <m0dB@mixxx.org>
Date:   Fri Aug 23 20:46:13 2024 +0200

    using rendergraph for allshader waveforms, with rendergraph::GeometryNode for end of track
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@rryan rryan

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@ywwg @daschuer @cpill0789 @kain88-de @pwhelan @esbrandt @rryan