Skip to content

Commit 1d8fcde

Browse files
committed
Fix OS X default for ejectOpticalDisc(), improve verbose output. Refs #10370
1 parent 67c86db commit 1d8fcde

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

mythtv/libs/libmyth/mythmediamonitor.cpp

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,13 @@ MythMediaDevice * MediaMonitor::selectDrivePopup(const QString label,
163163

164164
if (drives.count() == 0)
165165
{
166-
LOG(VB_MEDIA, LOG_INFO,
167-
"MediaMonitor::selectDrivePopup(" + label +
168-
") - No suitable devices");
166+
QString msg = "MediaMonitor::selectDrivePopup() ";
167+
if (m_StartThread)
168+
msg += "- no removable devices";
169+
else
170+
msg += "MonitorDrives is disabled - no device list";
171+
172+
LOG(VB_MEDIA, LOG_INFO, msg);
169173
return NULL;
170174
}
171175

@@ -933,8 +937,9 @@ void MediaMonitor::ejectOpticalDisc()
933937
LOG(VB_MEDIA, LOG_INFO, "Trying Linux 'eject -T' command");
934938
myth_system("eject -T");
935939
#elif CONFIG_DARWIN
936-
LOG(VB_MEDIA, LOG_INFO, "Trying 'disktool -e disk1");
937-
myth_system("disktool -e disk1");
940+
QString def = DEFAULT_CD;
941+
LOG(VB_MEDIA, LOG_INFO, "Trying 'disktool -e " + def);
942+
myth_system("disktool -e " + def);
938943
#endif
939944
}
940945
}

0 commit comments

Comments
 (0)