Skip to content

Commit fa4f599

Browse files
authored
Merge pull request #781 from JoergAtGithub/glossary_links_25
Glossary changes and link updates
2 parents 92747ad + f70bb8d commit fa4f599

7 files changed

Lines changed: 31 additions & 27 deletions

File tree

source/chapters/appendix/additional_resources.rst

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,11 @@ There are a variety of other resources where you can find out more:
3737
`<https://github.com/mixxxdj/mixxx/issues>`_
3838

3939
* **Mixxx Translations**: To translate Mixxx and promote your mother tongue, go
40-
to: `<https://www.transifex.com/mixxx-dj-software/public/>`_. Please
40+
to: `<https://explore.transifex.com/mixxx-dj-software/mixxxdj/>`_. Please
4141
read the `Translation FAQ <https://github.com/mixxxdj/mixxx/wiki/internationalization>`_
4242
first.
4343

4444
* **Social Media**: Follow us on `Mastodon <https://floss.social/@mixxx>`_,
45-
`Twitter <https://twitter.com/mixxxdj>`_, and
46-
`Facebook <https://www.facebook.com/pages/Mixxx-DJ-Software/21723485212>`_.
45+
`Bluesky <https://bsky.app/profile/mixxx.bsky.social>`_,
46+
`Facebook <https://www.facebook.com/pages/Mixxx-DJ-Software/21723485212>`_ and
47+
`YouTube <https://www.youtube.com/@mixxxdj/posts>`_

source/chapters/controlling_mixxx.rst

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -136,25 +136,27 @@ with a number of mappings for various devices. There are two levels of
136136
controller mappings:
137137

138138
* **Mixxx Certified Mappings**: These mappings are verified by the Mixxx
139-
Development Team.
139+
Development Team and are distributed as part of Mixxx itself.
140140
* **Community Supported Mappings**: These mappings are provided and have been
141141
verified as working by the Mixxx community, but the Mixxx Development Team is
142142
unable to verify their quality because we don't have the devices ourselves.
143143
They might have bugs or rough edges.
144144

145-
If you run into issues with any of these mappings, please file a :term:`bug
146-
report` on our `Bug Tracker`_ or tell us about it on our mailing list, forums,
147-
or :term:`IRC` channel. Device support varies for each supported :term:`OS
145+
If you run into issues with Mixxx Certified Mappings, please file a :term:`bug
146+
report` on our `Bug Tracker`_.
147+
148+
If you run into issues with Community Supported Mappings please tell the community
149+
about it on our `Controller mapping forum`_.
150+
151+
Device support varies for each supported :term:`OS
148152
<operating system>`, so make sure to consult the documentation of the device.
149153

150154
.. hint:: Additional mappings are available in the `Controller mapping forum`_.
151155

152-
.. seealso:: Before purchasing a controller to use with Mixxx, consult our
153-
`Hardware Compatibility wiki page`_. It contains the most
154-
up-to-date information about which controllers work with Mixxx and
155-
the details of each.
156+
.. seealso:: Before purchasing a controller to use with Mixxx, check our
157+
:ref:`Controller List <hardware-manuals>`, that contains all
158+
Mixxx Certified Mappings, that are bundled with Mixxx.
156159

157-
.. _Hardware Compatibility wiki page: https://github.com/mixxxdj/mixxx/wiki/Hardware-Compatibility
158160
.. _Bug Tracker: https://github.com/mixxxdj/mixxx/issues
159161
.. _Controller mapping forum: https://mixxx.discourse.group/c/controller-mappings/10
160162

source/chapters/getting_involved.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ As a non-developer
2626
* Update our `Wiki <https://github.com/mixxxdj/mixxx/wiki>`_ to make sure the
2727
information on it is up to date.
2828
* Translate Mixxx using `Transifex
29-
<https://www.transifex.com/mixxx-dj-software/public/>`_
29+
<https://explore.transifex.com/mixxx-dj-software/mixxxdj/>`_
3030
* Answer questions on the `Help & Support Forum
3131
<https://mixxx.discourse.group/c/support/6>`_
3232
* Help promote Mixxx: If you've got a blog, write an article about Mixxx. Blog

source/chapters/hardware.rst

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,7 @@ Additionally, you might consider getting the following equiment:
3939

4040
.. seealso:: Instructions how to use DJ Controllers that work
4141
out-of-the-box with Mixxx can be found in the :ref:`Hardware Manuals
42-
<hardware-manuals>` section of this manual. The `Mixxx DJ Hardware Guide
43-
<https://github.com/mixxxdj/mixxx/wiki/Hardware-Compatibility>`_ on the
44-
Mixxx Wiki also lists additional devices, including information about their
45-
prices, features, and compatibility with Mixxx.
42+
<hardware-manuals>` section of this manual.
4643

4744
.. _hardware-controllers:
4845

source/chapters/microphones.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ with Mixxx, each with their own pros and cons:
2424
headphone jack. Also, they can be difficult to configure at the
2525
same time as a different audio interface for music output.
2626

27-
.. seealso:: The `Mixxx DJ Hardware Guide <https://github.com/mixxxdj/mixxx/wiki/Hardware-Compatibility>`_
27+
.. seealso:: The `Mixxx DJ Hardware Guide <https://github.com/mixxxdj/mixxx/wiki/Hardware-Compatibility#user-content-usb-audio-interfaces>`_
2828
lists specific audio interfaces with information about their prices,
2929
features, and suitability for use with microphones.
3030

source/glossary.rst

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,12 @@ Glossary of Terms
66

77
ASIO
88
Audio Stream Input/Output
9-
ASIO is a :term:`low-latency <latency>` :term:`audio interface` :term:`API` on Microsoft Windows.
9+
Steinbergs ASIO is a third-party :term:`low-latency <latency>` Sound :term:`API`
10+
for Microsoft Windows, and is seen the de facto standard for professional audio
11+
devices on Windows.
12+
13+
ASIO shows usually better performance than the Sound APIs of Windows itself,
14+
but only when the hardware manufacturer provides a dedicated ASIO driver.
1015

1116
cueing
1217
Headphone cueing, or just cueing, is listening to the next track you would
@@ -81,13 +86,6 @@ Glossary of Terms
8186
it and play the track, just like you would put a record on turntable and
8287
play it.
8388

84-
IRC
85-
Internet Relay Chat
86-
IRC is an online chat network. The Mixxx IRC channel
87-
was on the `FreeNode IRC Network <https://freenode.net>`_ in the ``#mixxx``
88-
channel. The channel was replaced in 2018 by the
89-
:term:`Mixxx Zulip Chat <Zulip>`.
90-
9189
Zulip
9290
`Zulip <https://zulipchat.com/>`_ is a powerful, open source group chat
9391
application that combines the immediacy of real-time chat with the
@@ -133,6 +131,12 @@ Glossary of Terms
133131
control DJ software using physical knobs, faders, and wheels on controllers
134132
instead of using a computer keyboard and mouse.
135133

134+
DVS
135+
Digital Vinyl System
136+
A system consisting of a traditional turntable, a special vinyl record encoded
137+
with a digital :term:`timecode` instead of an analog audio track, an :term:`audio interface`,
138+
and a computer running DJ software such as Mixxx that supports :term:`vinyl control` functionality.
139+
136140
vinyl control
137141
A method of controlling DJ applications which simulates the traditional
138142
DJing paradigm of two turntables. Using special :term:`timecode` media,

source/hardware/controllers/behringer_ddm4000.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ used either for audio or as MIDI controller:
2424
The mixer contains no digital interfaces for audio or microphones.
2525

2626
* `Manufacturer's product page <https://www.behringer.com/behringer/product?modelCode=P0167>`_
27-
* `User Manual <https://mediadl.musictribe.com/media/sys_master/h1f/h4d/8849404887070.pdf>`_
27+
* `User Manual <https://fast-images.static-thomann.de/pics/atg/atgdata/document/manual/206918_manual.pdf>`_
2828
* `Forum thread <https://mixxx.discourse.group/t/ddm4000-controller-mapping/20045>`_
2929

3030
.. versionadded:: 2.3

0 commit comments

Comments
 (0)