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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
126 commits
Select commit Hold shift + click to select a range
fd68cab
Remove skin not needed for demo, keep 2-deck Deere1280x800-WXGA as fa…
esbrandt Jan 15, 2012
5b86d71
Set default skin to Deere1920x1080-FullHD and work from there for 4-d…
esbrandt Jan 15, 2012
8604071
Added / changed some graphics for 4-Deck skin
esbrandt Jan 16, 2012
b6db9d3
Merge from lp:mixxx
esbrandt Jan 16, 2012
39c384d
Add 4-deck support to Deere1920x1080-FullHD skin
esbrandt Jan 16, 2012
83eef93
Oops, deactivate debugging borders for widgetgroups in skin.xml
esbrandt Jan 18, 2012
c2eff7e
Merging from lp:~jus/+junk/vci400-demo
rryan Jan 19, 2012
b361aa6
Merge updates from jus
rryan Jan 19, 2012
8b1204d
Add default skin flags
rryan Jan 19, 2012
ce4f40f
Add mix orientation push buttons for each channel (orientation_left o…
rryan Jan 19, 2012
c199239
Updates to vCI-400 mapping
rryan Jan 19, 2012
1b1dcc7
Add ghetto-sync (TM). Also hook up sampler triggers to VCI-400
rryan Jan 19, 2012
676ca2f
Merge with lp:mixxx
ywwg Feb 27, 2012
ff0a493
ENVIRONMENT -- do not include in final patch
ywwg Mar 12, 2012
7bb5905
merge from lp:mixxx
ywwg Mar 12, 2012
1dd1063
Initial implementation, untested
ywwg Mar 19, 2012
c92a698
note to myself that implementation is wrong
ywwg Mar 19, 2012
fcf6d58
merge from lp:mixxx
ywwg Mar 21, 2012
d6c3fce
refactored everything again -- it compiles now!
ywwg Mar 25, 2012
5ad4be0
First successful proof of concept (bpm matching)
ywwg Mar 25, 2012
e090c85
implement phase syncing in bpmcontrol.cpp by subtly adjusting rate un…
ywwg Mar 31, 2012
3816d75
merge with lp:mixxx (big waveform merge)
ywwg Apr 8, 2012
e7d39b5
begin work on internal sync
ywwg Apr 8, 2012
ed47181
Incorporate Ben Clark's amazing library rescan patch (lp:#966963)
ywwg Apr 8, 2012
2f522b7
Mostly finish internal sync. It's alive...
ywwg Apr 9, 2012
7754f49
merge from lp:mixxx
ywwg Apr 22, 2012
17b42bd
Allow user to use temp pitch bend, wheel, and jog to tweak sync (when…
ywwg Apr 22, 2012
2cf1acf
big, troublesome merge with lp:mixxx
ywwg May 3, 2012
0e67dc9
if quantize is on, always sync phase (includes play button, hotcues, …
ywwg May 3, 2012
ce853a1
when syncing phase remember the user's offset value
ywwg May 3, 2012
2191df7
phase matching should be against master, not against another track!
ywwg May 3, 2012
ff0c650
moved back to keeping track of user offset in percent, not samples.
ywwg May 3, 2012
5c9aa1d
merge from lp:mixxx, try to clean up skin conflict
ywwg May 14, 2012
0ac249e
merge from lp:mixxx
ywwg Aug 24, 2012
879c0ec
lots of work getting UI hooked up, still a long way to go
ywwg Aug 24, 2012
0c207b8
fixed not receiving samplerate changes
ywwg Aug 27, 2012
9293e44
Moved master/slave supervision to enginesync instead of per-deck logi…
ywwg Aug 28, 2012
75a87bb
make sure to receive internal disablings of sync_master CO
ywwg Aug 28, 2012
8999f9f
master sync pretty much works
ywwg Aug 29, 2012
b0c7e8e
Fix slaves not moving in reverse-direction
ywwg Aug 30, 2012
99081ad
keep pseudoposition always correct even when deck is master
ywwg Aug 30, 2012
bcf5a38
merge from lp:mixxx
ywwg Sep 4, 2012
f909aa7
fix borked merge
ywwg Sep 4, 2012
2f50b87
actually merge in my skin
ywwg Sep 4, 2012
1ccdbae
skin customizations
ywwg Nov 6, 2012
5638dc1
awful, horrible, giant merge with tons of conflicts. no doubt error-…
ywwg Dec 30, 2012
5a4c5f0
fix some merge issues
ywwg Dec 31, 2012
44f4023
hey maybe this should build
ywwg Dec 31, 2012
3f46f3a
merge from lp:mixxx/1.11
ywwg Jan 13, 2013
1294bf0
Add basic 4-Deck LateNight1680x1050-WSXGA+ skin and work from here fo…
esbrandt Jan 13, 2013
d7e3b7d
Move Play & Cue controls from the Mixer panel to the Decks Panel.
esbrandt Jan 13, 2013
2606d42
Change Cue/Play button positioning
esbrandt Jan 13, 2013
351e5c2
Positioning Microphone WidgetGroup
esbrandt Jan 13, 2013
0b3b580
Add EQ`s for Deck 3 & 4
esbrandt Jan 13, 2013
d424aff
Added Volume Slider, PFL, FX controls for Deck 3 & 4. Move Master vol…
esbrandt Jan 13, 2013
e224ec9
Remove WidgetGroups debug boarders
esbrandt Jan 13, 2013
93a4973
Apply all changes from r3183-3189 for basic 4-Deck LateNight1280x800-…
esbrandt Jan 18, 2013
59e6a25
Reverse cherry pick r3183-3189. Deletes LateNight1680x1050-WSXGA+ whi…
esbrandt Jan 18, 2013
c6e60be
Adapt latest color and spacing fixes from lp:~mixxxdevelopers/mixxx/1…
esbrandt Jan 20, 2013
57714d8
Add separate LateNight1280x800-4Deck-WXGA skin folder and work from h…
esbrandt Feb 3, 2013
0f6d50c
Correct <title> in skin.xml
esbrandt Feb 3, 2013
25470a4
Merge from lp:mixxx/1.11
esbrandt Feb 3, 2013
ca162f6
Remove obsolete <MarkerColor> from LateNight1280x800-4Deck-WXGA/skin.xml
esbrandt Feb 3, 2013
79af3ab
Use current Sampler 2&3 row to control Deck 3&4. This make 4 regular …
esbrandt Feb 3, 2013
988809e
Match waveform & text color for Deck 1+3 & Deck 2+4
esbrandt Feb 3, 2013
6b89b70
Merge from lp:/mixxx/1.11
esbrandt Feb 16, 2013
68f4737
merge from lp:mixxx/1.11
ywwg Apr 16, 2013
113f159
Merge branch 'master' into master_sync
ywwg Apr 17, 2013
f583393
Merge branch 'master' into master_sync-skin
ywwg Apr 17, 2013
c647110
Merge branch 'master_sync-skin' into master_sync
ywwg Apr 17, 2013
3595756
init git ignore file
ywwg Apr 17, 2013
28b49e0
Merge branch 'master' into master_sync
ywwg Apr 17, 2013
5a77b77
ignore backup files
ywwg Apr 22, 2013
dfbf135
Merge branch 'bzr/master'
ywwg Apr 24, 2013
ae12db7
Merge branch 'bzr/master'
ywwg Apr 30, 2013
7844874
Merge branch 'bzr/master'
ywwg May 2, 2013
ab1ea6f
Merge branch 'bzr/master'
ywwg May 4, 2013
b6269ee
Merge branch 'bzr/master'
ywwg May 5, 2013
1da8a25
Merge branch 'bzr/master'
ywwg May 6, 2013
af21b0f
merge from lp:mixxx
ywwg May 6, 2013
de44dcb
Merge branch 'bzr/master_sync' into master_sync
ywwg May 6, 2013
f8bf516
Merge branch 'master' into master_sync
ywwg May 6, 2013
bbfdef6
small tweaks
ywwg May 6, 2013
b543c35
Clean commit with just my 1080p Hi DPI skins
ywwg May 6, 2013
cec8334
added master and slave assets
ywwg May 7, 2013
68d4188
Merge branch 'DJO_t-biggerskin' into master_sync
ywwg May 7, 2013
f6df874
fix problem with filebpm not getting initialized
ywwg May 8, 2013
57f5107
qtcreator made these I think
ywwg May 9, 2013
851c2e1
resize vinyl indicators
ywwg May 9, 2013
7f1bf76
Merge branch 'HighDPISkin' into master_sync
ywwg May 9, 2013
d48e4e5
don't try to quantize beat position in small loops
ywwg May 9, 2013
2bac8de
Cherry-pick schema version 18 from features_key so beta testers can u…
rryan May 7, 2013
012c26d
Version bump to 1.12.0-alpha-pre.
rryan May 7, 2013
fd9cafe
Add Vedant Agarwala to the contributor list.
rryan May 7, 2013
57b4c03
Bring back EnginePassthrough since we could use it for an auxiliary i…
rryan May 7, 2013
148eeba
Minor nits from the vinyl-passthrough merge. Avoid values() calls on …
rryan May 7, 2013
ecc1a8a
Remove Q_ASSERTs in EngineDeck. Support mono input (just in case).
rryan May 7, 2013
228567a
Update translation templates for https://translations.launchpad.net/m…
esbrandt May 9, 2013
ea29a76
massive style cleanup
ywwg May 11, 2013
c87b1f6
move to a single state variable instead of dumb two variables
ywwg May 11, 2013
e21f398
tons of cleanup
ywwg May 11, 2013
39d9b0f
fix rate slider clamping rate in slave mode
ywwg May 11, 2013
0719fb3
fix some sync-tweak stuff
ywwg May 11, 2013
770901d
always update rateEngine value
ywwg May 11, 2013
586a386
Merge branch 'rateEngine' into master_sync
ywwg May 11, 2013
10cca89
use existing rateEngine CO instead of true_rate
ywwg May 11, 2013
2714ff8
clean up confusing places where rate sometimes includes baserate adju…
ywwg May 11, 2013
852ab5d
add decks 3 and 4 to vinyl control manager and preferences
ywwg May 11, 2013
cf93d3f
more channel 3 and 4 configs
ywwg May 11, 2013
3e1462d
reduce fuzz again
ywwg May 12, 2013
e18d0ca
load tracks inside out
ywwg May 12, 2013
2575bbf
m_rate_old needs to be based on resample_rate
ywwg May 12, 2013
bd30d91
remove old BPM analyser code, Fix Bug #1179038
May 12, 2013
b95dce0
Merge branch 'master' into master_sync
ywwg May 12, 2013
430d940
sync master slider with master deck
ywwg May 12, 2013
6009fe3
fix segfault (check pointer != null)
ywwg May 12, 2013
1b45bd1
use [Skin] designation in other 4deck skin
ywwg May 13, 2013
aa8975e
don't allow setting of master if no track loaded
ywwg May 14, 2013
f30290f
Merge branch 'bzr-trunk' into master_sync
ywwg May 16, 2013
860417e
fix merge
ywwg May 16, 2013
117407b
small fixes, need two scripts for xone
ywwg May 16, 2013
f77a14d
bonehead typos
ywwg May 16, 2013
b5e511f
Merge branch 'atomic-co-rryan' into atomic-rryan-master
ywwg May 16, 2013
fea1efc
fix build issues, delete excess files
ywwg May 16, 2013
ba97bf9
cleanup
ywwg May 16, 2013
12f8467
Merge remote-tracking branch 'mixxx/master' into atomic-rryan-master
ywwg May 18, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
7 changes: 7 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
*.o
*.os
*.orig
*.rej
*.pyc
*.log
*~
1 change: 1 addition & 0 deletions mixxx/build/depends.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,7 @@ def sources(self, build):
"engine/enginepregain.cpp",
"engine/enginechannel.cpp",
"engine/enginemaster.cpp",
"engine/enginesync.cpp",
"engine/enginedelay.cpp",
"engine/engineflanger.cpp",
"engine/enginevumeter.cpp",
Expand Down
Loading