diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2020-05-30 17:51:46 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2020-05-30 17:51:46 +0900 |
| commit | e5dbf18d724862fcc68939877130cd96c3a66626 (patch) | |
| tree | 5638f4341e44567e2cc60368eb216133365bce04 /kplayer/kplayernode.cpp | |
| parent | d6cadef12069813beee36422c64a1f22f20ebdfc (diff) | |
| download | kplayer-e5dbf18d724862fcc68939877130cd96c3a66626.tar.gz kplayer-e5dbf18d724862fcc68939877130cd96c3a66626.zip | |
Improved support for bluray discs.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'kplayer/kplayernode.cpp')
| -rw-r--r-- | kplayer/kplayernode.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/kplayer/kplayernode.cpp b/kplayer/kplayernode.cpp index f79f37b..d564353 100644 --- a/kplayer/kplayernode.cpp +++ b/kplayer/kplayernode.cpp @@ -2402,12 +2402,17 @@ void KPlayerDevicesNode::setupSource (void) connect (&m_lister, SIGNAL (deleteItem (KFileItem*)), SLOT (removed (KFileItem*))); TQStringList mimetypes; mimetypes.append ("media/audiocd"); + mimetypes.append ("media/bluray_mounted"); + mimetypes.append ("media/bluray_unmounted"); mimetypes.append ("media/cdrom_mounted"); mimetypes.append ("media/cdrom_unmounted"); + mimetypes.append ("media/cd-r_mounted"); + mimetypes.append ("media/cd-r_unmounted"); mimetypes.append ("media/cd-rw_mounted"); mimetypes.append ("media/cd-rw_unmounted"); mimetypes.append ("media/dvd_mounted"); mimetypes.append ("media/dvd_unmounted"); + mimetypes.append ("media/blurayvideo"); mimetypes.append ("media/dvdvideo"); mimetypes.append ("media/svcd"); mimetypes.append ("media/vcd"); @@ -2675,8 +2680,9 @@ void KPlayerDevicesNode::refreshItem (KFileItem* item) kdDebugTime() << " Path " << path << "\n"; #endif TQString type (item -> mimetype() == "media/audiocd" ? I18N_NOOP("Audio CD") - : item -> mimetype() == "media/dvdvideo" ? "DVD" - : item -> mimetype() == "media/svcd" || item -> mimetype() == "media/vcd" ? I18N_NOOP("Video CD") + : item -> mimetype().startsWith ("media/bluray") ? I18N_NOOP("BLURAY") + : item -> mimetype() == "media/dvdvideo" ? I18N_NOOP("DVD") + : (item -> mimetype() == "media/svcd" || item -> mimetype() == "media/vcd") ? I18N_NOOP("Video CD") : item -> mimetype().startsWith ("media/dvd") ? I18N_NOOP("Data DVD") : I18N_NOOP("Data CD")); #ifdef DEBUG_KPLAYER_NODE kdDebugTime() << " Type " << type << "\n"; @@ -3138,6 +3144,8 @@ void KPlayerDiskNode::autodetect (void) connect (job, SIGNAL(result(TDEIO::Job*)), SLOT(statResult(TDEIO::Job*))); return; } + else if ( ! m_fast_autodetect && m_url == "bluray://" + || m_fast_autodetect && disk() -> type() == "BLURAY" && m_url != "bluray://" ) else if ( ! m_fast_autodetect && m_url == "data://" || m_fast_autodetect && disk() -> type() == "Video CD" && m_url != "vcd://" ) m_url = "vcd://"; @@ -3252,7 +3260,7 @@ void KPlayerDiskNode::autodetected (void) kdDebugTime() << "KPlayerDiskNode::autodetected\n"; #endif TQString type (m_url == "cdda://" ? "Audio CD" : m_url == "dvd://" ? "DVD" - : m_url == "vcd://" ? "Video CD" : disk() -> type()); + : m_url == "vcd://" ? "Video CD" : m_url == "bluray://" ? "BLURAY" : disk() -> type()); setDiskType (type); if ( m_detected_tracks ) disk() -> setTracks (m_detected_tracks); |