Added "Play BluRay disc" to media player

3 files changed, 18 insertions, 8 deletions

diff --git a/config.h b/config.h
index ec7dc2c2..5c636d87 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h,v 1.65 2009-10-25 12:56:11 phintuka Exp $
+ * $Id: config.h,v 1.66 2009-10-25 13:02:33 phintuka Exp $
  *
  */
 
@@ -172,6 +172,7 @@
 #define MEDIA_MENU_IMAGES       (1<<2)
 #define MEDIA_MENU_DVD          (1<<3)
 #define MEDIA_MENU_CD           (1<<4)
+#define MEDIA_MENU_BLURAY       (1<<5)
 #define MEDIA_MENU_VIDEO_SETUP  (1<<6)
 #define MEDIA_MENU_AUDIO_SETUP  (1<<7)
 
diff --git a/menu.c b/menu.c
index 689827de..50f56797 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c,v 1.69 2009-10-25 12:56:11 phintuka Exp $
+ * $Id: menu.c,v 1.70 2009-10-25 13:02:33 phintuka Exp $
  *
  */
 
@@ -275,13 +275,11 @@ eOSState cMenuBrowseFiles::Open(bool ForceOpen, bool Queue, bool Rewind)
       return osEnd;
     }
     if(!ForceOpen && GetCurrent()->IsBluRay()) {
-#if 0
-      /* play bd */
-      cString f = cString::sprintf("bd:%s/%s", m_CurrentDir, GetCurrent()->Name());
+      /* play BluRay disc/image */
+      cString f = cString::sprintf("bluray:%s/%s/", m_CurrentDir, GetCurrent()->Name());
       cControl::Shutdown();
-      cControl::Launch(new cXinelibBdPlayerControl(f));
+      cControl::Launch(new cXinelibDvdPlayerControl(f));
       return osEnd;
-#endif
     }
     if(ForceOpen && GetCurrent()->IsDir() &&
        !GetCurrent()->IsDvd() && !GetCurrent()->IsBluRay()) {
@@ -536,6 +534,12 @@ cMenuXinelib::cMenuXinelib()
     else
       Add(new cOsdItem(tr("Play audio CD >>"), osUser6));
   }
+  if (xc.media_menu_items & MEDIA_MENU_BLURAY) {
+    if(xc.remote_mode)
+      Add(new cOsdItem(tr("Play remote BluRay >>"), osUser5));
+    else
+      Add(new cOsdItem(tr("Play BluRay disc >>"), osUser5));
+  }
 
   if (xc.media_menu_items & MEDIA_MENU_VIDEO_SETUP) {
   Add(NewTitle(tr("Video settings")));
@@ -650,6 +654,10 @@ eOSState cMenuXinelib::ProcessKey(eKeys Key)
       cControl::Shutdown();
       cControl::Launch(new cXinelibDvdPlayerControl("dvd:/"));
       return osEnd;
+    case osUser5:
+      cControl::Shutdown();
+      cControl::Launch(new cXinelibDvdPlayerControl("bluray:/"));
+      return osEnd;
     case osUser6:
       cControl::Shutdown();
       cControl::Launch(new cXinelibPlayerControl(ShowMusic, "cdda:/"));
diff --git a/setup_menu.c b/setup_menu.c
index 426dc31b..f70161be 100644
--- a/setup_menu.c
+++ b/setup_menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: setup_menu.c,v 1.72 2009-10-25 12:56:11 phintuka Exp $
+ * $Id: setup_menu.c,v 1.73 2009-10-25 13:02:33 phintuka Exp $
  *
  */
 
@@ -1681,6 +1681,7 @@ void cMenuSetupMediaPlayer::Set(void)
   Add(new cMenuEditBitItem(tr("View images >>"),      &newconfig.media_menu_items, MEDIA_MENU_IMAGES));
   Add(new cMenuEditBitItem(tr("Play DVD disc >>"),    &newconfig.media_menu_items, MEDIA_MENU_DVD));
   Add(new cMenuEditBitItem(tr("Play audio CD >>"),    &newconfig.media_menu_items, MEDIA_MENU_CD));
+  Add(new cMenuEditBitItem(tr("Play BluRay disc >>"), &newconfig.media_menu_items, MEDIA_MENU_BLURAY));
   Add(new cMenuEditBitItem(tr("Video settings"),      &newconfig.media_menu_items, MEDIA_MENU_VIDEO_SETUP));
   Add(new cMenuEditBitItem(tr("Audio settings"),      &newconfig.media_menu_items, MEDIA_MENU_AUDIO_SETUP));