Cosmetics: make indentation less inconsistent.

modules/access/vcdx/access.c

@@ -20,9 +20,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -38,7 +38,6 @@
 #include <vlc_input.h>
 #include <vlc_access.h>
 #include <vlc_charset.h>
-#include "vlc_keys.h"
 
 #include <cdio/cdio.h>
 #include <cdio/cd_types.h>
@@ -223,19 +222,17 @@ VCDReadBlock( access_t * p_access )
       /* Update seekpoint */
       if ( VCDINFO_ITEM_TYPE_ENTRY == p_vcdplayer->play_item.type )
       {
-        unsigned int i_entry = p_vcdplayer->play_item.num+1;
+        size_t i_entry = p_vcdplayer->play_item.num+1;
         lsn_t  i_lsn   = vcdinfo_get_entry_lsn(p_vcdplayer->vcd, i_entry);
         if ( p_vcdplayer->i_lsn >= i_lsn && i_lsn != VCDINFO_NULL_LSN )
         {
-            const track_t i_track = p_vcdplayer->i_track;
-
             dbg_print( (INPUT_DBG_LSN|INPUT_DBG_PBC),
                        "entry change to %d, current LSN %u >= end %u",
                        i_entry, p_vcdplayer->i_lsn, i_lsn);
 
             p_vcdplayer->play_item.num = i_entry;
 
-            VCDSetOrigin( p_access,  i_lsn, i_track,
+            VCDSetOrigin( p_access,  i_lsn, p_vcdplayer->i_track,
                           &(p_vcdplayer->play_item) );
         }
       }
@@ -471,11 +468,9 @@ VCDTitles( access_t * p_access )
                                                         vlc_input_title_New();
             char psz_track[80];
 
-            snprintf( psz_track, sizeof(psz_track), "%s %02d", _("Track"),
-                                                    i );
+            snprintf( psz_track, sizeof(psz_track), "%s %02d", _("Track"), i );
             t->i_size    = (int64_t) vcdinfo_get_track_size( p_vcdplayer->vcd,
-                                 i )
-          * M2F2_SECTOR_SIZE / CDIO_CD_FRAMESIZE ;
+                                 i ) * M2F2_SECTOR_SIZE / CDIO_CD_FRAMESIZE ;
             t->psz_name  = strdup(psz_track);
 
             dbg_print( INPUT_DBG_MRL, "track[%d] i_size: %lld", i, t->i_size );
@@ -532,8 +527,7 @@ VCDLIDs( access_t * p_access )
         char psz_lid[100];
         seekpoint_t *s = vlc_seekpoint_New();
 
-        snprintf( psz_lid, sizeof(psz_lid), "%s %02d", _("LID"),
-                  i_lid );
+        snprintf( psz_lid, sizeof(psz_lid), "%s %02d", _("LID"), i_lid );
 
         s->i_byte_offset = 0; /*  A lid doesn't have an offset
                                   size associated with it */
@@ -696,7 +690,7 @@ VCDSetOrigin( access_t *p_access, lsn_t i_lsn, track_t i_track,
       {
         p_access->info.i_size = p_vcdplayer->p_title[i_track-1]->i_size;
         p_access->info.i_pos  = (int64_t) M2F2_SECTOR_SIZE *
-      (vcdinfo_get_track_lsn(p_vcdplayer->vcd, i_track) - i_lsn) ;
+                   (vcdinfo_get_track_lsn(p_vcdplayer->vcd, i_track) - i_lsn);
       } else {
         p_access->info.i_size = M2F2_SECTOR_SIZE * (int64_t)
                 vcdinfo_get_entry_sect_count(p_vcdplayer->vcd, p_itemid->num);
@@ -735,7 +729,7 @@ VCDSetOrigin( access_t *p_access, lsn_t i_lsn, track_t i_track,
   }
 
   p_access->info.i_update = INPUT_UPDATE_TITLE|INPUT_UPDATE_SIZE
-    |  INPUT_UPDATE_SEEKPOINT;
+                            |INPUT_UPDATE_SEEKPOINT;
 
   VCDUpdateTitle( p_access );