[vlc-commits] demux: ts: rename SI file

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Mon Jul 18 11:28:55 2016 +0200| [dedcaac8362bf3b43c8cc780ca123f3fc24ac0c8] | committer: Francois Cartegnie

demux: ts: rename SI file

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=dedcaac8362bf3b43c8cc780ca123f3fc24ac0c8
---

 modules/demux/Makefile.am                    |    2 +-
 modules/demux/mpeg/ts.c                      |    2 +-
 modules/demux/mpeg/ts_psi.c                  |    2 +-
 modules/demux/mpeg/{ts_psi_eit.c => ts_si.c} |   10 +++++-----
 modules/demux/mpeg/{ts_psi_eit.h => ts_si.h} |    2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/demux/Makefile.am b/modules/demux/Makefile.am
index 9bab83a..71fd206 100644
--- a/modules/demux/Makefile.am
+++ b/modules/demux/Makefile.am
@@ -235,7 +235,7 @@ demux_LTLIBRARIES += libplaylist_plugin.la
 libts_plugin_la_SOURCES = demux/mpeg/ts.c demux/mpeg/ts.h \
         demux/mpeg/ts_pid.h demux/mpeg/ts_pid_fwd.h demux/mpeg/ts_pid.c \
         demux/mpeg/ts_psi.h demux/mpeg/ts_psi.c \
-        demux/mpeg/ts_psi_eit.h demux/mpeg/ts_psi_eit.c \
+        demux/mpeg/ts_si.h demux/mpeg/ts_si.c \
         demux/mpeg/ts_psip.h demux/mpeg/ts_psip.c \
         demux/mpeg/ts_psip_dvbpsi_fixes.h demux/mpeg/ts_psip_dvbpsi_fixes.c \
         demux/mpeg/ts_decoders.h demux/mpeg/ts_decoders.c \
diff --git a/modules/demux/mpeg/ts.c b/modules/demux/mpeg/ts.c
index aed4edd..539a90f 100644
--- a/modules/demux/mpeg/ts.c
+++ b/modules/demux/mpeg/ts.c
@@ -39,7 +39,7 @@
 #include "ts_streams.h"
 #include "ts_streams_private.h"
 #include "ts_psi.h"
-#include "ts_psi_eit.h"
+#include "ts_si.h"
 #include "ts_psip.h"
 
 #include "ts_hotfixes.h"
diff --git a/modules/demux/mpeg/ts_psi.c b/modules/demux/mpeg/ts_psi.c
index 906ef5d..8d2f5db 100644
--- a/modules/demux/mpeg/ts_psi.c
+++ b/modules/demux/mpeg/ts_psi.c
@@ -50,7 +50,7 @@
 #include "ts_sl.h"
 #include "ts_scte.h"
 #include "ts_psip.h"
-#include "ts_psi_eit.h"
+#include "ts_si.h"
 
 #include "../access/dtv/en50221_capmt.h"
 
diff --git a/modules/demux/mpeg/ts_psi_eit.c b/modules/demux/mpeg/ts_si.c
similarity index 99%
rename from modules/demux/mpeg/ts_psi_eit.c
rename to modules/demux/mpeg/ts_si.c
index 65e57fa..66f670d 100644
--- a/modules/demux/mpeg/ts_psi_eit.c
+++ b/modules/demux/mpeg/ts_si.c
@@ -36,7 +36,7 @@
 #include <dvbpsi/tot.h> /* TDT support */
 #include <dvbpsi/dr.h>
 
-#include "ts_psi_eit.h"
+#include "ts_si.h"
 
 #include "ts_pid.h"
 #include "ts_streams_private.h"
@@ -50,11 +50,11 @@
 #include <time.h>
 #include <assert.h>
 
-#ifndef PSI_DEBUG_EIT
- #define PSI_DEBUG_TIMESHIFT(t)
+#ifndef SI_DEBUG_EIT
+ #define SI_DEBUG_TIMESHIFT(t)
 #else
  static time_t i_eit_debug_offset = 0;
- #define PSI_DEBUG_TIMESHIFT(t) \
+ #define SI_DEBUG_TIMESHIFT(t) \
     do {\
         if( i_eit_debug_offset == 0 )\
             i_eit_debug_offset = time(NULL) - t;\
@@ -395,7 +395,7 @@ static void EITCallBack( demux_t *p_demux, dvbpsi_eit_t *p_eit )
         int i_min_age = 0;
 
         i_start = EITConvertStartTime( p_evt->i_start_time );
-        PSI_DEBUG_TIMESHIFT(i_start);
+        SI_DEBUG_TIMESHIFT(i_start);
         i_duration = EITConvertDuration( p_evt->i_duration );
 
         /* We have to fix ARIB-B10 as all timestamps are JST */
diff --git a/modules/demux/mpeg/ts_psi_eit.h b/modules/demux/mpeg/ts_si.h
similarity index 98%
rename from modules/demux/mpeg/ts_psi_eit.h
rename to modules/demux/mpeg/ts_si.h
index 702d96f..8a111c4 100644
--- a/modules/demux/mpeg/ts_psi_eit.h
+++ b/modules/demux/mpeg/ts_si.h
@@ -21,7 +21,7 @@
 
 #include "ts_pid_fwd.h"
 
-//#define PSI_DEBUG_EIT
+//#define SI_DEBUG_EIT
 
 #define TS_SI_SDT_PID 0x11
 #define TS_SI_EIT_PID 0x12