Skip to content

Commit

Permalink
Merge remote-tracking branch 'mixxx/2.3' into 2.4
Browse files Browse the repository at this point in the history
  • Loading branch information
ronso0 committed Dec 9, 2023
2 parents 3f001f2 + 66bbc71 commit c3ab4a6
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions source/chapters/preferences/sound_hardware.rst
Original file line number Diff line number Diff line change
Expand Up @@ -231,10 +231,9 @@ Inputs
* **Vinyl Control 1-4**: Inputs to be used for :ref:`vinyl control and passthrough <vinyl-control>`.
Note that one input can be selected for multiple decks.

* **Microphone 1-4**: ref:`Microphone <microphones>` inputs.
* **Microphone 1-4**: The :ref:`microphone <microphones>` inputs.

* **Auxiliary 1-4**: Auxiliary inputs.
.. TODO: link to Aux chapter when it's been added.

* **Record/Broadcast**: The input used for the Mixxx-internal :ref:`recording <djing-recording-your-mix>` and :ref:`broadcasting <live-broadcasting>`.
Note that when setting this input your recording and broadcast stream will
Expand Down

0 comments on commit c3ab4a6

Please sign in to comment.