build: use the same default optical drive for everything #15889
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kasper93
reviewed
Feb 17, 2025
|
Download the artifacts for this pull request: |
Amusingly, this was not working correctly for at least a decade. For all OSes, the default drive is the same except for macOS. It had "/dev/diskN" as the default dvd drive. Back in the mplayer days, there was actually dynamic compile time generation (only for mac) that replaced the N with the actual number*. But this didn't actually work for all stream types. It seems like it never worked for stream_dvdnav and was only a stream_dvd (libdvdread) feature. And then later that stream got removed completely. So at least for macOS users, they had a fallback device of "/dev/diskN" for certain stream types and for a very long time. We can't really do better here, but we should at least pick a default string that has a chance of working. So /dev/disk1 it is then. With that, all of the devices become the same so we can combine it all and use the same default optical drive for both CDs and DVDs. BD will be added in the next commit. Also /dev/dvd is some antiquated thing that doesn't really exist anymore. Linux systems will likely still have /dev/cdrom which has a decent chance of being usable. /dev/dvd probably won't be there. *: f215e84
Unlike the other ones, stream_bluray had no default drive to choose as a fallback so make it use DEFAULT_OPTICAL_DRIVE.
a7240c8 to
b1ba230
Compare
|
Needs docs update, specifically the dvd part Line 3764 in bede446 |
|
Ugh, those docs aren't even right today. Who is compiling mpv on a non-Windows, non-darwin, non-linux, and non-BSD system? Edit: added a doc commit for that. |
Unless you were compiling on an obscure OS, the default drive location was never /dev/dvd.
kasper93
approved these changes
Feb 17, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A trip down mplayer commits.