lp:~mixxxdevelopers/mixxx/iTunes2
The new sql-based iTunes feature that resolves manual merging conflicts with trunk.
- Get this branch:
- bzr branch lp:~mixxxdevelopers/mixxx/iTunes2
Branch merges
- RJ Skerry-Ryan: Approve
-
Diff: 1687 lines (+776/-696)9 files modifiedmixxx/res/schema.xml (+27/-0)
mixxx/src/library/itunesfeature.cpp (+398/-33)
mixxx/src/library/itunesfeature.h (+18/-6)
mixxx/src/library/itunesplaylistmodel.cpp (+162/-233)
mixxx/src/library/itunesplaylistmodel.h (+29/-53)
mixxx/src/library/itunestrackmodel.cpp (+104/-302)
mixxx/src/library/itunestrackmodel.h (+36/-67)
mixxx/src/library/library.cpp (+1/-1)
mixxx/src/library/trackcollection.cpp (+1/-1)
Branch information
Recent revisions
- 2565. By RJ Skerry-Ryan
-
Switch iTunes trackmodel and playlits model to use custom header states instead of the mixxx playlist one.
- 2564. By RJ Skerry-Ryan
-
Adding a warning message when the iTunes library fails to load. Make failed parses of iTunes still select in the track model because it might have gotten partially through the file and showing some is better than showing none.
- 2563. By RJ Skerry-Ryan
-
Adding updates. Split itunes SQL revision into revision 8 from 7 since 7 is now permanent. Add safety from infinite loops in parsing. Fix indentation to be 4-space indents.
- 2562. By raffitea
-
Same functionality as feature_ iTunes but potential merge conflicts have been resolved.
- 2561. By RJ Skerry-Ryan
-
Fixing DlgTrackInfo to not use WTrackTableView's stylesheet. Fixes Bug #673411
- 2560. By RJ Skerry-Ryan
-
Move all setupConnections to come after WWidget::setup() is called. Fixes bug #676863
- 2559. By RJ Skerry-Ryan
-
Revert WStatusLight to r2557. The changes did not make sense as part of features_library, and will be picked up in features_xwax. Fixes regression in peak indicators. Bug #676895
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:~mixxxdevelopers/mixxx/trunk