lp:~mixxxdevelopers/mixxx/features_recording2

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~mixxxdevelopers/mixxx/trunk at revision 2746

RJ Skerry-Ryan: Approve on 2011-04-10

Diff: 3191 lines (+1581/-659)

38 files modified

mixxx/build/depends.py (+6/-0)
mixxx/res/mixxx.qrc (+1/-0)
mixxx/src/audiotagger.cpp (+47/-43)
mixxx/src/audiotagger.h (+3/-3)
mixxx/src/dlgautodj.cpp (+9/-2)
mixxx/src/dlgautodj.h (+3/-1)
mixxx/src/dlgprefrecord.cpp (+138/-113)
mixxx/src/dlgprefrecord.h (+11/-7)
mixxx/src/dlgprefrecorddlg.ui (+229/-316)
mixxx/src/dlgprefshoutcastdlg.ui (+14/-2)
mixxx/src/dlgrecording.cpp (+177/-0)
mixxx/src/dlgrecording.h (+63/-0)
mixxx/src/dlgrecording.ui (+87/-0)
mixxx/src/engine/enginemaster.cpp (+5/-0)
mixxx/src/engine/enginemaster.h (+9/-2)
mixxx/src/engine/enginesidechain.cpp (+5/-0)
mixxx/src/engine/enginesidechain.h (+8/-3)
mixxx/src/library/autodjfeature.cpp (+2/-1)
mixxx/src/library/browse/browsefeature.cpp (+4/-2)
mixxx/src/library/browse/browsefeature.h (+2/-1)
mixxx/src/library/browse/browsetablemodel.cpp (+198/-17)
mixxx/src/library/browse/browsetablemodel.h (+46/-38)
mixxx/src/library/browse/browsethread.cpp (+3/-0)
mixxx/src/library/browse/browsethread.h (+3/-1)
mixxx/src/library/library.cpp (+7/-3)
mixxx/src/library/library.h (+3/-1)
mixxx/src/library/recording/recordingfeature.cpp (+98/-0)
mixxx/src/library/recording/recordingfeature.h (+62/-0)
mixxx/src/library/traktor/traktorfeature.cpp (+1/-1)
mixxx/src/library/traktor/traktorplaylistmodel.cpp (+1/-1)
mixxx/src/library/traktor/traktortablemodel.cpp (+5/-2)
mixxx/src/mixxx.cpp (+33/-80)
mixxx/src/mixxx.h (+3/-0)
mixxx/src/recording/defs_recording.h (+19/-0)
mixxx/src/recording/enginerecord.cpp (+23/-18)
mixxx/src/recording/enginerecord.h (+5/-1)
mixxx/src/recording/recordingmanager.cpp (+167/-0)
mixxx/src/recording/recordingmanager.h (+81/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #669283: Offer a possilibilty to split recorded files	Wishlist	Fix Released
Bug #672914: Add naming pattern to recorded files	Wishlist	Fix Released

Link a bug report

Related blueprints

2729. By Tobias <Tobias@Silverstar> on 2011-04-11

Merging frun trunk

2728. By RJ Skerry-Ryan on 2011-04-10

Fix issue w/ removing multiple tracks at once.

2727. By RJ Skerry-Ryan on 2011-04-10

Remove extraneous line

2726. By RJ Skerry-Ryan on 2011-04-10

Remove unused variable.

2725. By RJ Skerry-Ryan on 2011-04-10

Fix formatting here and there.

2724. By Raffitea on 2011-04-06

Merging from trunk

2723. By Tobias <Tobias@Silverstar> on 2011-04-01

Merging from trunk

2722. By Raffitea on 2011-03-31

Fixed row selection issue on drag 'n drop

2721. By Raffitea on 2011-03-31

Fix: Show all colums in Traktor Library, i.e., fixed a SQL statement; Fix: Move columns of TraktorTables; Various other fixes

2720. By Raffitea on 2011-03-31

Implemented tagging for BrowseTableModels; Renaming filename, bitrate, duration and type is not allowed.; Do allow tagging if file is in use by Mixxx