[vlc-commits] Modules: Remove tabs in source code
Jean-Baptiste Kempf
git at videolan.org
Thu Nov 5 10:05:40 CET 2015
vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Nov 5 10:03:19 2015 +0100| [5dafc001bb1f8fc6a2dc2b51eed7a4486ab2f9f2] | committer: Jean-Baptiste Kempf
Modules: Remove tabs in source code
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5dafc001bb1f8fc6a2dc2b51eed7a4486ab2f9f2
---
modules/access/mtp.c | 2 +-
modules/audio_output/audioqueue.c | 8 ++++----
modules/audio_output/sndio.c | 38 +++++++++++++++++------------------
modules/codec/kate.c | 2 +-
modules/control/oldrc.c | 2 +-
modules/demux/mjpeg.c | 16 +++++++--------
modules/lua/libs/playlist.c | 2 +-
modules/lua/vlc.h | 7 ++++---
modules/misc/securetransport.c | 4 ++--
modules/video_chroma/i420_rgb_mmx.h | 10 ++++-----
10 files changed, 46 insertions(+), 45 deletions(-)
diff --git a/modules/access/mtp.c b/modules/access/mtp.c
index bc4ff70..a80299a 100644
--- a/modules/access/mtp.c
+++ b/modules/access/mtp.c
@@ -165,7 +165,7 @@ static void Close( vlc_object_t * p_this )
access_sys_t *p_sys = p_access->p_sys;
close ( p_sys->fd );
- if( vlc_unlink( p_access->psz_filepath ) != 0 )
+ if( vlc_unlink( p_access->psz_filepath ) != 0 )
msg_Err( p_access, "Error deleting file %s, %s",
p_access->psz_filepath, vlc_strerror_c(errno) );
free( p_sys );
diff --git a/modules/audio_output/audioqueue.c b/modules/audio_output/audioqueue.c
index 312fcb9..b594a8f 100644
--- a/modules/audio_output/audioqueue.c
+++ b/modules/audio_output/audioqueue.c
@@ -165,10 +165,10 @@ static int Start(audio_output_t *p_aout, audio_sample_format_t *restrict fmt)
NULL,
NULL);
- // Set audio session to mediaplayback
- UInt32 sessionCategory = kAudioSessionCategory_MediaPlayback;
- AudioSessionSetProperty(kAudioSessionProperty_AudioCategory, sizeof(sessionCategory),&sessionCategory);
- AudioSessionSetActive(true);
+ // Set audio session to mediaplayback
+ UInt32 sessionCategory = kAudioSessionCategory_MediaPlayback;
+ AudioSessionSetProperty(kAudioSessionProperty_AudioCategory, sizeof(sessionCategory),&sessionCategory);
+ AudioSessionSetActive(true);
#endif
p_aout->sys->b_started = true;
diff --git a/modules/audio_output/sndio.c b/modules/audio_output/sndio.c
index ecc0bfd..4d023a0 100644
--- a/modules/audio_output/sndio.c
+++ b/modules/audio_output/sndio.c
@@ -77,26 +77,26 @@ static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt)
sio_initpar (&par);
switch (fmt->i_format) {
case VLC_CODEC_U8:
- par.bits = 8;
- par.sig = 0;
- break;
+ par.bits = 8;
+ par.sig = 0;
+ break;
case VLC_CODEC_S16N:
- par.bits = 16;
- par.sig = 1;
- par.le = SIO_LE_NATIVE;
- break;
+ par.bits = 16;
+ par.sig = 1;
+ par.le = SIO_LE_NATIVE;
+ break;
case VLC_CODEC_S32N:
case VLC_CODEC_FL32:
case VLC_CODEC_FL64:
- par.bits = 32;
- par.sig = 1;
- par.le = SIO_LE_NATIVE;
- break;
+ par.bits = 32;
+ par.sig = 1;
+ par.le = SIO_LE_NATIVE;
+ break;
default:
- /* use a common audio format */
- par.bits = 16;
- par.sig = 1;
- par.le = SIO_LE_NATIVE;
+ /* use a common audio format */
+ par.bits = 16;
+ par.sig = 1;
+ par.le = SIO_LE_NATIVE;
}
par.pchan = aout_FormatNbChannels (fmt);
par.rate = fmt->i_rate;
@@ -124,7 +124,7 @@ static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt)
if (par.bps > 1 && par.le != SIO_LE_NATIVE)
{
msg_Err (aout, "unsupported audio sample format (%s endian)",
- par.le ? "little" : "big");
+ par.le ? "little" : "big");
goto error;
}
switch (par.bits)
@@ -221,7 +221,7 @@ static int TimeGet (audio_output_t *aout, mtime_t *restrict delay)
aout_sys_t *sys = aout->sys;
if (!sys->started)
- return -1;
+ return -1;
*delay = (mtime_t)sys->delay * CLOCK_FREQ / sys->rate;
return 0;
}
@@ -263,9 +263,9 @@ static int VolumeSet (audio_output_t *aout, float fvol)
unsigned volume;
if (fvol < 0)
- fvol = 0;
+ fvol = 0;
if (fvol > 1)
- fvol = 1;
+ fvol = 1;
volume = lroundf (fvol * SIO_MAXVOL);
if (!sys->mute && !sio_setvol (sys->hdl, volume))
return -1;
diff --git a/modules/codec/kate.c b/modules/codec/kate.c
index e3bb494..b427662 100644
--- a/modules/codec/kate.c
+++ b/modules/codec/kate.c
@@ -657,7 +657,7 @@ static void GetVideoSize( decoder_t *p_dec, int *w, int *h )
*w = p_sys->ki.original_canvas_width;
*h = p_sys->ki.original_canvas_height;
msg_Dbg( p_dec, "original canvas %zu %zu",
- p_sys->ki.original_canvas_width, p_sys->ki.original_canvas_height );
+ p_sys->ki.original_canvas_width, p_sys->ki.original_canvas_height );
}
else
{
diff --git a/modules/control/oldrc.c b/modules/control/oldrc.c
index 6a6f1cd..85f3c8e 100644
--- a/modules/control/oldrc.c
+++ b/modules/control/oldrc.c
@@ -1024,7 +1024,7 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd,
}
else if ( !strcmp( psz_cmd, "frame" ) )
{
- var_TriggerCallback( p_input, "frame-next" );
+ var_TriggerCallback( p_input, "frame-next" );
i_error = VLC_SUCCESS;
}
else if( !strcmp( psz_cmd, "chapter" ) ||
diff --git a/modules/demux/mjpeg.c b/modules/demux/mjpeg.c
index af6fcea..a1f70c6 100644
--- a/modules/demux/mjpeg.c
+++ b/modules/demux/mjpeg.c
@@ -322,14 +322,14 @@ static int Open( vlc_object_t * p_this )
char* boundary = strstr( content_type, "boundary=" );
if( boundary )
{
- boundary += strlen( "boundary=" );
- size_t len = strlen( boundary );
- if( len > 2 && boundary[0] == '"'
- && boundary[len-1] == '"' )
- {
- boundary[len-1] = '\0';
- boundary++;
- }
+ boundary += strlen( "boundary=" );
+ size_t len = strlen( boundary );
+ if( len > 2 && boundary[0] == '"'
+ && boundary[len-1] == '"' )
+ {
+ boundary[len-1] = '\0';
+ boundary++;
+ }
p_sys->psz_separator = strdup( boundary );
if( !p_sys->psz_separator )
{
diff --git a/modules/lua/libs/playlist.c b/modules/lua/libs/playlist.c
index 1159262..d4b07a5 100644
--- a/modules/lua/libs/playlist.c
+++ b/modules/lua/libs/playlist.c
@@ -169,7 +169,7 @@ static int vlclua_playlist_move( lua_State * L )
if( p_target->i_children != -1 )
i_ret = playlist_TreeMove( p_playlist, p_item, p_target, 0 );
else
- i_ret = playlist_TreeMove( p_playlist, p_item, p_target->p_parent, p_target->i_id - p_target->p_parent->pp_children[0]->i_id + 1 );
+ i_ret = playlist_TreeMove( p_playlist, p_item, p_target->p_parent, p_target->i_id - p_target->p_parent->pp_children[0]->i_id + 1 );
PL_UNLOCK;
return vlclua_push_ret( L, i_ret );
}
diff --git a/modules/lua/vlc.h b/modules/lua/vlc.h
index 53d9761..c68f832 100644
--- a/modules/lua/vlc.h
+++ b/modules/lua/vlc.h
@@ -43,10 +43,11 @@
#include <lua.h> /* Low level lua C API */
#include <lauxlib.h> /* Higher level C API */
#include <lualib.h> /* Lua libs */
+
#if LUA_VERSION_NUM >= 502
-#define lua_equal(L,idx1,idx2) lua_compare(L,(idx1),(idx2),LUA_OPEQ)
-#define lua_objlen(L,idx) lua_rawlen(L,idx)
-#define lua_strlen(L,idx) lua_rawlen(L,idx)
+# define lua_equal(L,idx1,idx2) lua_compare(L,(idx1),(idx2),LUA_OPEQ)
+# define lua_objlen(L,idx) lua_rawlen(L,idx)
+# define lua_strlen(L,idx) lua_rawlen(L,idx)
#endif
/*****************************************************************************
diff --git a/modules/misc/securetransport.c b/modules/misc/securetransport.c
index 8b79b67..f9ba1bc 100644
--- a/modules/misc/securetransport.c
+++ b/modules/misc/securetransport.c
@@ -47,8 +47,8 @@ static int OpenClient (vlc_tls_creds_t *);
static void CloseClient (vlc_tls_creds_t *);
#if !TARGET_OS_IPHONE
- static int OpenServer (vlc_tls_creds_t *crd, const char *cert, const char *key);
- static void CloseServer (vlc_tls_creds_t *);
+ static int OpenServer (vlc_tls_creds_t *crd, const char *cert, const char *key);
+ static void CloseServer (vlc_tls_creds_t *);
#endif
vlc_module_begin ()
diff --git a/modules/video_chroma/i420_rgb_mmx.h b/modules/video_chroma/i420_rgb_mmx.h
index 29d51b9..5491329 100644
--- a/modules/video_chroma/i420_rgb_mmx.h
+++ b/modules/video_chroma/i420_rgb_mmx.h
@@ -50,11 +50,11 @@ static const uint64_t mmx_mask_fc = 0xfcfcfcfcfcfcfcfcULL; /* -- as %13 */
: \
: "r" (p_y), "r" (p_u), \
"r" (p_v), "r" (p_buffer), \
- "m" (mmx_80w), "m" (mmx_10w), \
- "m" (mmx_00ffw), "m" (mmx_Y_coeff), \
- "m" (mmx_U_green), "m" (mmx_U_blue), \
- "m" (mmx_V_red), "m" (mmx_V_green), \
- "m" (mmx_mask_f8), "m" (mmx_mask_fc) \
+ "m" (mmx_80w), "m" (mmx_10w), \
+ "m" (mmx_00ffw), "m" (mmx_Y_coeff), \
+ "m" (mmx_U_green), "m" (mmx_U_blue), \
+ "m" (mmx_V_red), "m" (mmx_V_green), \
+ "m" (mmx_mask_f8), "m" (mmx_mask_fc) \
: "mm0", "mm1", "mm2", "mm3", "mm4", "mm5", "mm6", "mm7" ); \
} while(0)
More information about the vlc-commits
mailing list