[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [dragon/bluray] src/app: BluRay!
From:       Harald Sitter <sitter () kde ! org>
Date:       2012-06-01 7:17:29
Message-ID: 20120601071729.90532A60BB () git ! kde ! org
[Download RAW message or body]

Git commit cc33acb95a680fb606b0f63cf93b39184f242893 by Harald Sitter.
Committed on 01/06/2012 at 09:17.
Pushed by sitter into branch 'bluray'.

BluRay!

M  +5    -1    src/app/mainWindow.cpp
M  +4    -0    src/app/videoWindow.cpp

http://commits.kde.org/dragon/cc33acb95a680fb606b0f63cf93b39184f242893

diff --git a/src/app/mainWindow.cpp b/src/app/mainWindow.cpp
index 3b79c73..fcba93d 100644
--- a/src/app/mainWindow.cpp
+++ b/src/app/mainWindow.cpp
@@ -641,7 +641,11 @@ MainWindow::playDisc()
             const Solid::OpticalDisc* disc = device.as<const Solid::OpticalDisc>();
             if( disc )
             {
-                if( disc->availableContent() & ( Solid::OpticalDisc::VideoDvd | \
Solid::OpticalDisc::VideoCd | Solid::OpticalDisc::SuperVideoCd |  \
Solid::OpticalDisc::Audio ) ) +                if( disc->availableContent() & ( \
Solid::OpticalDisc::VideoDvd +                                                 | \
Solid::OpticalDisc::VideoCd +                                                 | \
Solid::OpticalDisc::SuperVideoCd +                                                 | \
Solid::OpticalDisc::Audio +                                                 | \
Solid::OpticalDisc::VideoBluRay ) )  playableDiscs << device;
 
             }
diff --git a/src/app/videoWindow.cpp b/src/app/videoWindow.cpp
index e94eca6..1cbdda0 100644
--- a/src/app/videoWindow.cpp
+++ b/src/app/videoWindow.cpp
@@ -276,6 +276,10 @@ VideoWindow::playDisc(const Solid::Device& device )
             case Solid::OpticalDisc::Audio:
                 phononType = Phonon::Cd;
                 break;
+#warning needs if phonon version!
+            case Solid::OpticalDisc::VideoBluRay:
+                phononType = Phonon::BluRay;
+                break;
             }
 
             if( phononType == Phonon::NoDisc ){


[prev in list] [next in list] [prev in thread] [next in thread]