Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1500 add physical cd drive support #1609

Merged
merged 31 commits into from
Jan 23, 2025
Merged
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
f33887f
feat: Add physical CD drive support in the GUI
midwan Nov 13, 2024
1feb58c
refactor: fix cdrom device names
midwan Nov 13, 2024
72507c2
refactor: remove unnecessary type change
midwan Nov 13, 2024
1aa52e6
refactor: store rootdir for CD devices in Amiberry
midwan Nov 13, 2024
d6fab36
feat: auto-detect and list physical cd drives in dropdowns
midwan Nov 14, 2024
a438cc3
refactor: added cdfs automount cd drives option in GUI
midwan Nov 14, 2024
e17794c
refactor: remove cd lists from dropdowns
midwan Nov 14, 2024
d365ada
refactor: minor optimizations in amiberry_filesys
midwan Nov 14, 2024
317d312
fixed build
midwan Nov 14, 2024
9ff49ba
feat: added blkdev_ioctl
midwan Nov 15, 2024
9a41642
Squashed commit of the following:
midwan Nov 16, 2024
56dc56a
Disable this for macOS for now
midwan Nov 16, 2024
9be4a72
better separation for macOS
midwan Nov 16, 2024
79ee7e5
Add device options in dropdowns.
midwan Nov 16, 2024
e420a8a
refactor sys_cddev_open
midwan Nov 16, 2024
22d02f0
refactor: improve IOCTL device detection
midwan Nov 16, 2024
317c385
silence some log entries that are making too much noise
midwan Nov 16, 2024
f286499
refactor: fetch geometry
midwan Nov 16, 2024
24190ae
refactor: remove no-op functions
midwan Nov 16, 2024
24e4725
refactor: close and re-open file handle when opening
midwan Nov 16, 2024
fe82bb1
Squashed commit of the following:
midwan Nov 23, 2024
261719b
Merge branch 'master' into 1500-add-physical-cd-drive-support
midwan Nov 25, 2024
618d72f
Merge branch 'master' into 1500-add-physical-cd-drive-support
midwan Nov 25, 2024
cc3d3a7
refactor: revert vbi changes #1515
midwan Nov 24, 2024
c2eeb04
Merge branch 'master' into 1500-add-physical-cd-drive-support
midwan Dec 5, 2024
1785c5e
Merge branch 'master' into 1500-add-physical-cd-drive-support
midwan Jan 6, 2025
1ce4f76
Fixes after merge
midwan Jan 6, 2025
8fd2ff4
refactor: use const in more places
midwan Jan 6, 2025
6e988f2
Merge branch 'master' into 1500-add-physical-cd-drive-support
midwan Jan 23, 2025
c0db52f
refactor: cdda_play should be int
midwan Jan 23, 2025
d6421ca
refactor: bring back PanelHDD changes after merge
midwan Jan 23, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
refactor: fix cdrom device names
midwan committed Nov 13, 2024

Verified

This commit was signed with the committer’s verified signature. The key has expired.
midwan Dimitris Panokostas
commit 1feb58c59e964e8cdc2e7f0c82b00ac8738ec7cc
5 changes: 3 additions & 2 deletions src/osdep/amiberry_gui.cpp
Original file line number Diff line number Diff line change
@@ -1306,14 +1306,15 @@ std::vector<std::string> get_cd_drives()
char path[MAX_DPATH];
std::vector<std::string> results{};

FILE* fp = popen("lsblk -o NAME,TYPE | grep 'rom'", "r");
FILE* fp = popen("lsblk -o NAME,TYPE | grep 'rom' | awk '{print \"/dev/\" $1}'", "r");
if (fp == nullptr) {
write_log("Failed to run 'lsblk' command, cannot auto-detect CD drives in system\n");
return results;
}

while (fgets(path, sizeof(path), fp) != nullptr) {
results.emplace_back(path);
path[strcspn(path, "\n")] = 0;
results.emplace_back(std::string(path));
}
pclose(fp);
return results;