[libbdplus-devel] [Git][videolan/libbdplus][master] 2 commits: cosmetics: fix indentation in bdplus.c:bdplus_m2ts() after cb46380c

[Petri Hintukainen (@hpi)]

Petri Hintukainen pushed to branch master at VideoLAN / libbdplus


Commits:
47b77538 by John Doe at 2021-10-05T20:49:30+02:00
cosmetics: fix indentation in bdplus.c:bdplus_m2ts() after cb46380c

- - - - -
eef7e479 by John Doe at 2021-10-05T20:50:23+02:00
Remove num_titles parameter from internal.c:bdplus_run_convtab()

Fixes:

src/libbdplus/internal.c: In function ‘bdplus_run_convtab’:
src/libbdplus/internal.c:337:53: warning: unused parameter ‘num_titles’ [-Wunused-parameter]
 int32_t bdplus_run_convtab(bdplus_t *plus, uint32_t num_titles)
                                                     ^~~~~~~~~~

- - - - -


3 changed files:

- src/libbdplus/bdplus.c
- src/libbdplus/bdplus_data.h
- src/libbdplus/internal.c


Changes:

=====================================
src/libbdplus/bdplus.c
=====================================
@@ -325,15 +325,15 @@ bdplus_st_t *bdplus_m2ts(bdplus_t *plus, uint32_t m2ts)
         }
 
     } else {
-    if (!plus->conv_tab) {
-        BD_DEBUG(DBG_BDPLUS | DBG_CRIT, "[bdplus] bdplus_m2ts(%05u.m2ts): no conversion table\n", m2ts);
-        bd_mutex_unlock(&plus->mutex);
-        return NULL;
-    }
+        if (!plus->conv_tab) {
+            BD_DEBUG(DBG_BDPLUS | DBG_CRIT, "[bdplus] bdplus_m2ts(%05u.m2ts): no conversion table\n", m2ts);
+            bd_mutex_unlock(&plus->mutex);
+            return NULL;
+        }
 
-    bdplus_run_m2ts(plus, m2ts);
+        bdplus_run_m2ts(plus, m2ts);
 
-    st = segment_set_m2ts(plus->conv_tab, m2ts);
+        st = segment_set_m2ts(plus->conv_tab, m2ts);
     }
 
     bd_mutex_unlock(&plus->mutex);
@@ -424,10 +424,8 @@ static int32_t _bdplus_event(bdplus_t *plus, uint32_t event, uint32_t param1, ui
             return 0;
         }
 
-        unsigned int num_titles = param2;
-
         bdplus_run_init(plus->vm);
-        return bdplus_run_convtab(plus, num_titles);
+        return bdplus_run_convtab(plus);
     }
 
 


=====================================
src/libbdplus/bdplus_data.h
=====================================
@@ -75,7 +75,7 @@ BD_PRIVATE int32_t  bdplus_save_slots ( bdplus_t *plus, const char *fname );
 
 BD_PRIVATE int32_t  bdplus_run_init   ( struct VM_s *vm );
 BD_PRIVATE int32_t  bdplus_run_idle   ( struct VM_s *vm );
-BD_PRIVATE int32_t  bdplus_run_convtab( bdplus_t *plus, uint32_t num_titles );
+BD_PRIVATE int32_t  bdplus_run_convtab( bdplus_t *plus );
 BD_PRIVATE int32_t  bdplus_run_title  ( bdplus_t *plus, uint32_t title );
 BD_PRIVATE int32_t  bdplus_run_m2ts   ( bdplus_t *plus, uint32_t m2ts );
 BD_PRIVATE int32_t  bdplus_run_shutdown(bdplus_t *plus );


=====================================
src/libbdplus/internal.c
=====================================
@@ -275,7 +275,7 @@ conv_table_t *bdplus_getConvTable(bdplus_t *plus)
  * conv_tables that are merged).
  *
  */
-int32_t bdplus_run_convtab(bdplus_t *plus, uint32_t num_titles)
+int32_t bdplus_run_convtab(bdplus_t *plus)
 {
     int32_t keep_running, ret;
     uint32_t current_break = 0;



View it on GitLab: https://code.videolan.org/videolan/libbdplus/-/compare/cb46380c62c4ef7d997a210bc0373eb0d764dcdb...eef7e479e751e367b5bdec4f1650e1c08f5b54fe

-- 
View it on GitLab: https://code.videolan.org/videolan/libbdplus/-/compare/cb46380c62c4ef7d997a210bc0373eb0d764dcdb...eef7e479e751e367b5bdec4f1650e1c08f5b54fe
You're receiving this email because of your account on code.videolan.org.