lp:~mixxxdevelopers/mixxx/features_cuefile

Branch merges

Propose for merging

No branches dependent on this one.

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

RJ Skerry-Ryan: Approve on 2011-03-25

Diff: 1231 lines (+552/-272)

9 files modified

mixxx/src/dlgprefrecord.cpp (+43/-0)
mixxx/src/dlgprefrecord.h (+3/-0)
mixxx/src/dlgprefrecorddlg.ui (+57/-0)
mixxx/src/engine/engineshoutcast.cpp (+170/-251)
mixxx/src/engine/engineshoutcast.h (+1/-4)
mixxx/src/playerinfo.cpp (+97/-8)
mixxx/src/playerinfo.h (+11/-0)
mixxx/src/recording/enginerecord.cpp (+151/-9)
mixxx/src/recording/enginerecord.h (+19/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2630. By Phillip Whelan on 2011-03-25

FIX: take into account that TrackInfoObject->getId() == -1 for external track sources.

2629. By Phillip Whelan on 2011-03-25

FIX: get xfader code to work orientation values; left = 0, right = 2.

2628. By Phillip Whelan on 2011-03-23

Make getCurrentPlayingDeck method thread safe with a Mutex. getCurrentPlayingTrack does not need a Mutex since it calls mutex'd methods and uses no other state itself.

2627. By Phillip Whelan on 2011-03-23

Move all the Current Deck code into PlayerInfo. Make it N-deck aware.

  * Add the getCurrentPlayingDeck method to PlayerInfo:
      Returns the deck number of the loudest active deck.
  * Add the getCurrentPlayingTrack method to PlayerInfo.
  * Refactor EngineRecord to query PlayerInfo for the current track.
  * Refactor EngineShoutCast to query Playerinfo for the current track.
  * Change instances of m_pMetadataLife to m_iMetadataLife.

2626. By Phillip Whelan on 2011-03-23

Merging from Trunk.

2625. By Phillip Whelan on 2011-02-28

Merging from Trunk.

2624. By Phillip Whelan on 2011-02-28

Merging from Trunk.

2623. By Phillip Whelan on 2011-02-15

Close the CUE file when destroying EngineRecord.

2622. By Phillip Whelan on 2011-01-21

Commiting the first version of CUE file recording.

2621. By Phillip Whelan on 2011-01-07

Merging Upgrade Fix from 1.9.