From 014b55579cdad9996fef10c20481d62a7d9bb27b Mon Sep 17 00:00:00 2001
From: phintuka <phintuka>
Date: Sat, 11 Dec 2010 21:15:13 +0000
Subject: Renamed num_titles -> num_title_idx

---
 xine/BluRay/input_bluray.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/xine/BluRay/input_bluray.c b/xine/BluRay/input_bluray.c
index ffce1b4a..6b7396b2 100644
--- a/xine/BluRay/input_bluray.c
+++ b/xine/BluRay/input_bluray.c
@@ -115,7 +115,7 @@ typedef struct {
 
   BLURAY               *bdh;
 
-  int                num_titles;
+  int                num_title_idx;
   int                current_title_idx;
   BLURAY_TITLE_INFO *title_info;
   int                current_clip;
@@ -235,10 +235,10 @@ static void update_title_info(bluray_input_plugin_t *this)
   };
   if (this->disc_name && this->disc_name[0])
     udata.str_len = snprintf(udata.str, sizeof(udata.str), "%s, Title %d/%d",
-                             this->disc_name, this->current_title_idx + 1, this->num_titles);
+                             this->disc_name, this->current_title_idx + 1, this->num_title_idx);
   else
     udata.str_len = snprintf(udata.str, sizeof(udata.str), "Title %d/%d",
-                             this->current_title_idx + 1, this->num_titles);
+                             this->current_title_idx + 1, this->num_title_idx);
   xine_event_send(this->stream, &uevent);
 
   _x_meta_info_set(this->stream, XINE_META_INFO_TITLE, udata.str);
@@ -263,7 +263,7 @@ static void update_title_info(bluray_input_plugin_t *this)
 
   /* set stream info */
 
-  _x_stream_info_set(this->stream, XINE_STREAM_INFO_DVD_TITLE_COUNT,  this->num_titles);
+  _x_stream_info_set(this->stream, XINE_STREAM_INFO_DVD_TITLE_COUNT,  this->num_title_idx);
   _x_stream_info_set(this->stream, XINE_STREAM_INFO_DVD_TITLE_NUMBER, this->current_title_idx + 1);
 
   update_stream_info(this);
@@ -420,7 +420,7 @@ static void handle_events(bluray_input_plugin_t *this)
 
         case XINE_EVENT_INPUT_RIGHT:
           lprintf("XINE_EVENT_INPUT_RIGHT: previous title\n");
-          open_title(this, MIN(this->num_titles, this->current_title_idx + 1));
+          open_title(this, MIN(this->num_title_idx, this->current_title_idx + 1));
           stream_reset(this);
           break;
       }
@@ -450,7 +450,7 @@ static void handle_events(bluray_input_plugin_t *this)
         lprintf("XINE_EVENT_INPUT_NEXT: next chapter\n");
 
         if (chapter >= this->title_info->chapter_count) {
-          if (this->current_title_idx < this->num_titles - 1) {
+          if (this->current_title_idx < this->num_title_idx - 1) {
             open_title(this, this->current_title_idx + 1);
             stream_reset(this);
           }
@@ -862,10 +862,10 @@ static int bluray_plugin_open (input_plugin_t *this_gen)
 
   /* load title list */
 
-  this->num_titles = bd_get_titles(this->bdh, TITLES_RELEVANT);
-  LOGMSG("%d titles\n", this->num_titles);
+  this->num_title_idx = bd_get_titles(this->bdh, TITLES_RELEVANT);
+  LOGMSG("%d titles\n", this->num_title_idx);
 
-  if (this->num_titles < 1)
+  if (this->num_title_idx < 1)
     return -1;
 
   /* select title */
@@ -874,7 +874,7 @@ static int bluray_plugin_open (input_plugin_t *this_gen)
   if (title < 0) {
     uint64_t duration = 0;
     int i, playlist = 99999;
-    for (i = 0; i < this->num_titles; i++) {
+    for (i = 0; i < this->num_title_idx; i++) {
       BLURAY_TITLE_INFO *info = bd_get_title_info(this->bdh, i);
       if (info->duration > duration) {
         title    = i;
-- 
cgit v1.2.3