Changeset 470b47fe952dbba82beca44cafefd4b6ec711384

Timestamp:

28/03/06 22:29:28 (3 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

Clément Stenac <zorglub@videolan.org> 1143577768 +0000

git-parent:

[4dfd839aff9cfb0e3cd0e30b92e60af388bb0fc7]

git-author:

Clément Stenac <zorglub@videolan.org> 1143577768 +0000

Message:

String fixes in src (Refs:#438)

Files:

• src/audio_output/input.c (modified) (7 diffs)
• src/audio_output/intf.c (modified) (2 diffs)
• src/audio_output/mixer.c (modified) (1 diff)
• src/audio_output/output.c (modified) (2 diffs)
• src/control/mediacontrol_audio_video.c (modified) (3 diffs)
• src/control/mediacontrol_core.c (modified) (3 diffs)
• src/control/mediacontrol_util.c (modified) (1 diff)
• src/extras/libc.c (modified) (8 diffs)
• src/input/control.c (modified) (1 diff)
• src/input/decoder.c (modified) (2 diffs)
• src/input/demux.c (modified) (2 diffs)
• src/input/es_out.c (modified) (6 diffs)
• src/input/input.c (modified) (7 diffs)
• src/input/subtitles.c (modified) (8 diffs)
• src/interface/interaction.c (modified) (2 diffs)
• src/interface/interface.c (modified) (3 diffs)
• src/misc/objects.c (modified) (3 diffs)
• src/misc/stats.c (modified) (1 diff)
• src/misc/vlm.c (modified) (3 diffs)
• src/network/acl.c (modified) (4 diffs)

src/audio_output/input.c

@@ -167 +167 @@
-        if( psz_parser == NULL || !*psz_parser )
-            continue;
-
+
-        while( psz_parser && *psz_parser )
-        {
@@ -174 +174 @@
-            if( p_input->i_nb_filters >= AOUT_MAX_FILTERS )
-            {
-
+s
-                break;
-            }
@@ -211 +211 @@
-                memcpy( &p_filter->output, &chain_output_format,
-                        sizeof(audio_sample_format_t) );
-
+
-                p_filter->p_module = module_Need( p_filter, "visualization",
-                                                  psz_parser, VLC_TRUE );
@@ -236 +236 @@
-                        aout_FormatPrepare( &p_filter->input );
-                        aout_FormatPrepare( &p_filter->output );
-
+
+
-                                                          psz_parser, VLC_TRUE );
-                    }
@@ -246 +247 @@
-                        memcpy( &p_filter->output, &chain_output_format,
-                                sizeof(audio_sample_format_t) );
-
+
+
-                                                          psz_parser, VLC_TRUE );
-                    }
@@ -461 +463 @@
-        if( p_input->p_input_thread )
-        {
- 1,
-
+
+1, 
-        }
-        aout_BufferFree( p_buffer );
@@ -503 +505 @@
-        if( p_input->p_input_thread )
-        {
- 1,
-
+
+1, 
-        }
-        return 0;

src/audio_output/intf.c

@@ -159 +159 @@
-    config_PutInt( p_object, "volume", i_volume );
-    var_Create( p_object->p_libvlc, "saved-volume", VLC_VAR_INTEGER );
-
+
+
-    if ( pi_volume != NULL ) *pi_volume = (audio_volume_t) i_volume;
-
@@ -167 +168 @@
-    if ( !p_aout->mixer.b_error )
-    {
-
+
+
-    }
-    vlc_mutex_unlock( &p_aout->mixer_lock );

src/audio_output/mixer.c

@@ -47 +47 @@
-    if ( p_aout->mixer.p_module == NULL )
-    {
-out
+udio
-        return -1;
-    }

src/audio_output/output.c

@@ -58 +58 @@
-    if ( p_aout->output.p_module == NULL )
-    {
-o
+udio outp
-        vlc_mutex_unlock( &p_aout->output_fifo_lock );
-        return -1;
@@ -196 +196 @@
-                                     &p_aout->output.output ) < 0 )
-    {
-set an
+create audio
-        module_Unneed( p_aout, p_aout->output.p_module );
-        return -1;

src/control/mediacontrol_audio_video.c

@@ -98 +98 @@
-        p_pic = _mediacontrol_createRGBPicture( p_snapshot->i_width,
-                                                p_snapshot->i_height,
-                       
+                                                
-                                                p_snapshot->date,
-                                                p_snapshot->p_data,
@@ -200 +200 @@
-        mtime_t i_now = mdate();
-
-
-
-
-
+
+
+
+
+
-
-        mediacontrol_showtext( p_vout, DEFAULT_CHAN, psz_message, NULL,
@@ -226 +227 @@
-
-        i_debut = mediacontrol_position2microsecond( p_input,
-         
+
-        i_debut += i_now;
-
-        i_fin = mediacontrol_position2microsecond( p_input,
-         
+
-        i_fin += i_now;
-

src/control/mediacontrol_core.c

@@ -124 +124 @@
-    {
-        /* Relative or ModuloPosition make no sense */
-
+
+
-        return NULL;
-    }
@@ -365 +366 @@
-    vlc_value_t val;
-
-
+
+
-    if( ! retval )
-    {
@@ -411 +413 @@
-
-        retval->position = mediacontrol_unit_convert( p_input,
-             
-             
+
+
-        retval->length   = mediacontrol_unit_convert( p_input,
-             
-             
+
+
-    }
-    return retval;

src/control/mediacontrol_util.c

@@ -97 +97 @@
-        double f_fps;
-
-
+
+
-            return 0;
-

src/extras/libc.c

@@ -897 +897 @@
-        tv.tv_sec = 0;
-        tv.tv_usec = 10000;
-
+
-        i_ret = select( pi_stdin[0] > pi_stdout[0] ? pi_stdin[0] + 1 :
-                        pi_stdout[0] + 1, &readfds, &writefds, NULL, &tv );
@@ -959 +959 @@
-
-#elif defined( WIN32 ) && !defined( UNDER_CE )
- 
- 
+
+
-    STARTUPINFO siStartInfo;
- 
+
-    HANDLE hChildStdinRd, hChildStdinWr, hChildStdoutRd, hChildStdoutWr;
-    DWORD i_status;
@@ -970 +970 @@
-
-    /* Set the bInheritHandle flag so pipe handles are inherited. */
- 
- 
- 
+
+
+
-
-    /* Create a pipe for the child process's STDOUT. */
- 
-
- 
+
+
+
-        return -1;
-    }
@@ -985 +985 @@
-
-    /* Create a pipe for the child process's STDIN. */
- 
-
- 
+
+
+
-        return -1;
-    }
@@ -996 +996 @@
-    /* Set up members of the PROCESS_INFORMATION structure. */
-    ZeroMemory( &piProcInfo, sizeof(PROCESS_INFORMATION) );
-
+
-    /* Set up members of the STARTUPINFO structure. */
-    ZeroMemory( &siStartInfo, sizeof(STARTUPINFO) );
- 
+
-    siStartInfo.hStdError = hChildStdoutWr;
-    siStartInfo.hStdOutput = hChildStdoutWr;
@@ -1046 +1046 @@
-    }
-    *p = '\0';
-
+
-    /* Create the child process. */
-    bFuncRetn = CreateProcess( NULL,
- 
- 
- 
- 
- 
+
+
+
+
+
-          p_env,
-          psz_cwd,
- 
- 
+
+
-
-    free( psz_cmd );
-    free( p_env );
-
- 
-
- 
+
+
+
+
-        return -1;
-    }
@@ -1084 +1084 @@
-     * read end of the pipe. */
-    CloseHandle(hChildStdoutWr);
-
+
-    /* Read output from the child process. */
-    *pi_data = 0;
@@ -1092 +1092 @@
-    {
-        DWORD i_read;
- 
+
-                        NULL )
-              || i_read == 0 )
- 
+
-        *pi_data += i_read;
-        *pp_data = realloc( *pp_data, *pi_data + 1025 );

src/input/control.c

@@ -534 +534 @@
-    if( p_playlist )
-    {
-
+
+
-        vlc_object_release( p_playlist );
-    }

src/input/decoder.c

@@ -944 +944 @@
-        {
-            p_dec->fmt_out.video.i_visible_height = 1080;
- 
- 
+
+
-            msg_Warn( p_dec, "Fixing broken HDTV stream (display_height=1088)");
-        }
@@ -952 +952 @@
-            !p_dec->fmt_out.video.i_sar_den )
-        {
- 
+
-              p_dec->fmt_out.video.i_visible_height;
-

src/input/demux.c

@@ -76 +76 @@
-    if( s && *psz_module == '\0' && strrchr( p_demux->psz_path, '.' ) )
-    {
-
-
-
+
+
+
+
-         */
-         static struct { char *ext; char *demux; } exttodemux[] =
@@ -100 +101 @@
-        };
-        /* Here, we don't mind if it does not work, it must be quick */
- 
+
-        {
-            { "mp3", "mpga" },

src/input/es_out.c

@@ -180 +180 @@
-    {
-        for( i = 0; p_sys->ppsz_audio_language[i]; i++ )
- audio in
+ed audio
-                     i, p_sys->ppsz_audio_language[i] );
-    }
@@ -190 +190 @@
-    {
-        for( i = 0; p_sys->ppsz_sub_language[i]; i++ )
- subtitle in
+ed subtitle
-                     i, p_sys->ppsz_sub_language[i] );
-    }
@@ -288 +288 @@
-        es_out_id_t *es = p_sys->es[i];
-        es->b_discontinuity = VLC_TRUE; /* signal discontinuity */
-
+
-        /* Send a dummy block to let decoder know that
-         * there is a discontinuity */
@@ -369 +369 @@
-        if( es->psz_language && *es->psz_language )
-        {
-
-
+
+
+
+
-        }
-        else text.psz_string = strdup( es->fmt.psz_description );
@@ -379 +381 @@
-        {
-            char *temp;
-
+
+
-            asprintf( &temp,  _("Track %i"), val.i_int );
-            sprintf( text.psz_string, "%s - [%s]", temp, es->psz_language );
@@ -781 +784 @@
-                     es->i_id );
-            return;
-   
+        
-    }
-

src/input/input.c

@@ -208 +208 @@
-                     else if( !strncmp( psz_start, "time=", 5 ) )
-                     {
-
+
+
-                     }
-                     psz_start = psz_end + 1;
@@ -1577 +1578 @@
-                    input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE );
-                    es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR );
-
+
-                    access2_Control( p_access, ACCESS_SET_TITLE, i_title );
-                    stream_AccessReset( p_input->input.p_stream );
@@ -1618 +1619 @@
-                    input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE );
-                    es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR );
-
+
-                    demux2_Control( p_demux, DEMUX_SET_SEEKPOINT, i_seekpoint );
-                }
@@ -1654 +1655 @@
-                    input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE );
-                    es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR );
-
-
+
+
+
-                    stream_AccessReset( p_input->input.p_stream );
-                }
@@ -1972 +1974 @@
-{
-    input_source_t *in = (input_source_t*) malloc( sizeof( input_source_t ) );
-
+
-    if( !in )
-    {
@@ -2044 +2046 @@
-                psz_demux = psz_var_demux;
-
-Enforce
+enforced
-            }
-            else if( psz_var_demux )
@@ -2282 +2284 @@
-    int64_t i_time;
-    int i;
-   
+
-    if( demux2_Control( p_input->input.p_demux, DEMUX_GET_TIME, &i_time ) )
-    {

src/input/subtitles.c

@@ -37 +37 @@
-#endif
-
-  
-  
+
+
-#endif
-
@@ -65 +65 @@
- * The possible extentions for subtitle files we support
- */
-
+ 
-/* extensions from unsupported types */
-/* rt, aqt, jss, js, ass */
@@ -162 +162 @@
-}
-
-  
+
-static int Filter( const char *psz_dir_content )
-{
@@ -230 +230 @@
-                if( psz_temp )
-                {
- 
+
-                             psz_subdir[0] == '.' ? psz_dir : "",
-                             psz_subdir,
@@ -344 +344 @@
-    subdirs = tmp_subdirs;
-
- (*subdirs != NULL) );
-
+
+(*subdirs != NULL) );
-    {
-        const char *psz_dir = j < 0 ? f_dir : *subdirs;
@@ -365 +365 @@
-            for( a = 0; a < i_dir_content; a++ )
-            {
-
+
+
-                int i_prio = 0;
-
@@ -409 +410 @@
-
-                    sprintf( psz_path, "%s%s", psz_dir, psz_name );
-
+
+
+
-                    /* FIXME: a portable wrapper for stat() or access() would be more suited */
-                    if( ( f = utf8_fopen( psz_path, "rt" ) ) )
-                    {
-                        fclose( f );
-
+
+
+
-                        result[i_sub_count].priority = i_prio;
-                        result[i_sub_count].psz_fname = psz_path;
@@ -457 +462 @@
-            {
-                if( result[i].psz_fname && result[j].psz_fname &&
-
+
+
-                    !strcasecmp( result[i].psz_ext, "idx" ) )
-                    break;

src/interface/interaction.c

@@ -514 +514 @@
-    interaction_t *p_interaction;
-
-    msg_Dbg( p_playlist, "initializing interaction system" );
-
-    p_interaction = vlc_object_create( VLC_OBJECT( p_playlist ),
-                                       sizeof( interaction_t ) );
@@ -545 +543 @@
-    if( !p_list )
-    {
-U
+u
-        return;
-    }

src/interface/interface.c

@@ -120 +120 @@
-    if( p_intf->p_module == NULL )
-    {
-f
+erface
-        vlc_object_destroy( p_intf );
-        return NULL;
@@ -161 +161 @@
-        /* This is the primary intf */
-        /* Run a manager thread, launch the interface, kill the manager */
-r
+
-                               VLC_THREAD_PRIORITY_LOW, VLC_FALSE ) )
-        {
@@ -190 +190 @@
-        if( !strcmp( p_intf->p_module->psz_object_name, "macosx" ) )
-        {
-
+
+
+
-            return VLC_EGENERIC;
-        }

src/misc/objects.c

@@ -123 +123 @@
-        case VLC_OBJECT_DIALOGS:
-            i_size = sizeof(intf_thread_t);
- provider
+
-            break;
-        case VLC_OBJECT_PLAYLIST:
@@ -171 +171 @@
-        case VLC_OBJECT_SPU:
-            i_size = sizeof(spu_t);
- unit
+
-            break;
-        case VLC_OBJECT_AOUT:
@@ -207 +207 @@
-        case VLC_OBJECT_OPENGL:
-            i_size = sizeof( vout_thread_t );
- provider
+
-            break;
-        case VLC_OBJECT_ANNOUNCE:
-            i_size = sizeof( announce_handler_t );
- handler
+
-            break;
-        case VLC_OBJECT_OSDMENU:

src/misc/stats.c

@@ -506 +506 @@
-            p_counter->i_compute_type != STATS_LAST )
-        {
-U
+u
-            return VLC_EGENERIC;
-        }

src/misc/vlm.c

@@ -83 +83 @@
-    if( !(p_vlm = vlc_object_find( p_this, VLC_OBJECT_VLM, FIND_ANYWHERE )) )
-    {
-vlm
+VLM
-        if( ( p_vlm = vlc_object_create( p_this, VLC_OBJECT_VLM ) ) == NULL )
-        {
@@ -118 +118 @@
-        char *psz_buffer = NULL;
-
-vlm conf ...
+VLM configuration
-        asprintf(&psz_buffer, "load %s", psz_vlmconf );
-        if( psz_buffer )
@@ -124 +124 @@
-            msg_Dbg( p_this, psz_buffer);
-            if( vlm_ExecuteCommand( p_vlm, psz_buffer, &p_message ) ){
-vlm conf
+configuration
-            }
-            vlm_MessageDelete(p_message);

src/network/acl.c

@@ -98 +98 @@
-
-        default:
-IMPOSSIBLE: unknown address family!
+unknown address family
-            vlc_freeaddrinfo( res );
-            return -1;
@@ -284 +284 @@
-            if( ferror( file ) )
-            {
-E
+e
-                        strerror( errno ) );
-                goto error;
@@ -304 +304 @@
-        if( ptr == NULL )
-        {
-S
+s
-                      psz_path);
-            do
@@ -311 +311 @@
-                if( ferror( file ) || feof( file ) )
-                {
-E
+e
-                             psz_path, strerror( errno ) );
-                    goto error;