Changeset d4e7f95109c338b6cd8bf532e56fc9190855e32d

Timestamp:

08/13/05 15:19:30 (3 years ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1123939170 +0000

git-parent:

[c8c602161f8bf9378812f48a2c0ddd1f2acb3549]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1123939170 +0000

Message:

Revert commit [12128] that violate gettext rules
(carriage return are forbidden).

Files:

• modules/control/rc.c (modified) (24 diffs)

modules/control/rc.c

@@ -2 +2 @@
- * rc.c : remote control stdin/stdout module for vlc
- *****************************************************************************
-VideoLAN (Centrale Réseaux) and its contributors
+the VideoLAN team
- * $Id$
- *
@@ -135 +135 @@
-    {
-        net_vaPrintf( p_intf, p_intf->p_sys->i_socket, NULL, psz_fmt, args );
-/* net_Printf( VLC_OBJECT(p_intf), p_intf->p_sys->i_socket, NULL, "\r" ); */
+net_Printf( VLC_OBJECT(p_intf), p_intf->p_sys->i_socket, NULL, "\r" );
-    }
-    va_end( args );
@@ -324 +324 @@
-    }
-
-r\
+
-    return VLC_SUCCESS;
-}
@@ -622 +622 @@
-            {
-                i_oldpos = i_newpos;
-r\
+
-            }
-        }
@@ -661 +661 @@
-            val.psz_string = psz_arg;
-            i_ret = var_Set( p_intf, psz_cmd, val );
-r\
+
-                    psz_cmd, i_ret, vlc_error( i_ret ) );
-        }
@@ -676 +676 @@
-            if( i_ret != 0 )
-            {
-r\
+
-                         psz_cmd, i_ret, vlc_error( i_ret ) );
-            }
@@ -700 +700 @@
-                        p_input->input.p_item->pp_categories[i];
-
-r\
-r\
+
+
-                    for ( j = 0; j < p_category->i_infos; j++ )
-                    {
-                        info_t *p_info = p_category->pp_infos[j];
-r\
+
-                                p_info->psz_value );
-                    }
-r\
+
-                }
-r\
+
-                vlc_mutex_unlock( &p_input->input.p_item->lock );
-            }
-            else
-            {
-r\
+
-            }
-        }
@@ -722 +722 @@
-            if( ! p_input )
-            {
-r\
+
-            }
-            else
-            {
-r\
+
-
-                /* FIXME: This is a hack */
@@ -759 +759 @@
-            if( ! p_input )
-            {
-r\
+
-            }
-            else
@@ -765 +765 @@
-                vlc_value_t time;
-                var_Get( p_input, "time", &time );
-r\
+
-            }
-        }
@@ -772 +772 @@
-            if( ! p_input )
-            {
-r\
+
-            }
-            else
@@ -778 +778 @@
-                vlc_value_t time;
-                var_Get( p_input, "length", &time );
-r\
+
-            }
-        }
@@ -785 +785 @@
-            if( ! p_input )
-            {
-r\
+
-            }
-            else
-            {
-r\
+
-            }
-        }
@@ -829 +829 @@
-
-        default:
-r\
+
-            break;
-        }
@@ -862 +862 @@
-static void Help( intf_thread_t *p_intf, vlc_bool_t b_longhelp)
-{                
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    
-    if (b_longhelp)
-    {
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-r\
-
-r\
-r\
-r\
-r\
-r\
-r\
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -1137 +1137 @@
-                var_Change( p_input, "chapter", VLC_VAR_GETCHOICES,
-                            &val_list, NULL );
-r\
+
-                        val.i_int, val_list.p_list->i_count );
-                var_Change( p_this, "chapter", VLC_VAR_FREELIST,
@@ -1177 +1177 @@
-                var_Change( p_input, "title", VLC_VAR_GETCHOICES,
-                            &val_list, NULL );
-r\
+
-                        val.i_int, val_list.p_list->i_count );
-                var_Change( p_this, "title", VLC_VAR_FREELIST,
@@ -1275 +1275 @@
-        if( p_item )
-        {
-r\
+
-            playlist_AddItem( p_playlist, p_item,
-                              PLAYLIST_GO|PLAYLIST_APPEND, PLAYLIST_END );
@@ -1285 +1285 @@
-        for ( i = 0; i < p_playlist->i_size; i++ )
-        {
-r\
+
-                    p_playlist->pp_items[i]->input.psz_name,
-                    p_playlist->pp_items[i]->input.psz_uri,
@@ -1293 +1293 @@
-        if ( i == 0 )
-        {
-r\
+
-        }
-    }
@@ -1302 +1302 @@
-    else
-    {
-r\
+
-    }
-
@@ -1616 +1616 @@
-    else
-    {
-r\
+
-    }
-
@@ -1671 +1671 @@
-        if ( (i_volume > (audio_volume_t)AOUT_VOLUME_MAX) )
-        {
-r\
+
-                    AOUT_VOLUME_MAX );
-            i_error = VLC_EBADVAR;
@@ -1781 +1781 @@
-        }
-
-r\
+
-        for ( i = 0; i < val.p_list->i_count; i++ )
-        {
-            if ( i_value == val.p_list->p_values[i].i_int )
-r\
+
-                        text.p_list->p_values[i].psz_string );
-            else
-r\
+
-                        text.p_list->p_values[i].psz_string );
-        }
-        var_Change( (vlc_object_t *)p_aout, psz_variable, VLC_VAR_FREELIST,
-                    &val, &text );
-r\
+
-
-        if( val_name.psz_string ) free( val_name.psz_string );