Stop using strings to index stats, use integers. The list is not sorted yet, though

[vlc] / src / stream_output / stream_output.c

diff --git a/src/stream_output/stream_output.c b/src/stream_output/stream_output.c
index 4bfd91dab19c4a0cbf9a08f221bae2e3df88274c..cba1a98f80d38400397ead2e9543321a64ee48b1 100644 (file)
--- a/src/stream_output/stream_output.c
+++ b/src/stream_output/stream_output.c
@@ -143,13 +143,14 @@ sout_instance_t *__sout_NewInstance( vlc_object_t *p_parent, char * psz_dest )
     vlc_object_attach( p_sout, p_parent );
 
     /* Create statistics */
-    stats_Create( p_parent, "sout_sent_packets",
+    stats_Create( p_parent, "sout_sent_packets", STATS_SOUT_SENT_PACKETS,
                   VLC_VAR_INTEGER, STATS_COUNTER );
-    stats_Create( p_parent, "sout_sent_bytes", VLC_VAR_INTEGER, STATS_COUNTER );
-    stats_Create( p_parent, "sout_send_bitrate",
+    stats_Create( p_parent, "sout_sent_bytes", STATS_SOUT_SENT_BYTES,
+                  VLC_VAR_INTEGER, STATS_COUNTER );
+    stats_Create( p_parent, "sout_send_bitrate", STATS_SOUT_SEND_BITRATE,
                   VLC_VAR_FLOAT, STATS_DERIVATIVE );
     p_counter = stats_CounterGet( p_parent, p_parent->i_object_id,
-                    "sout_send_bitrate" );
+                                  STATS_SOUT_SEND_BITRATE );
     if( p_counter) p_counter->update_interval = 1000000;
 
     p_sout->p_stream = sout_StreamNew( p_sout, p_sout->psz_chain );
@@ -373,7 +374,7 @@ int sout_AccessOutWrite( sout_access_out_t *p_access, block_t *p_buffer )
     int i_total;
     p_access->i_writes++;
     p_access->i_sent_bytes += p_buffer->i_buffer;
-    if( p_access->p_libvlc->b_stats && p_access->i_writes % 10 == 0 )
+    if( p_access->p_libvlc->b_stats && p_access->i_writes % 30 == 0 )
     {
         /* Access_out -> sout_instance -> input_thread_t */
         input_thread_t *p_input =
@@ -381,10 +382,10 @@ int sout_AccessOutWrite( sout_access_out_t *p_access, block_t *p_buffer )
                                                FIND_PARENT );
         if( p_input )
         {
-            stats_UpdateInteger( p_input, "sout_sent_packets", 10, NULL );
-            stats_UpdateInteger( p_input, "sout_sent_bytes",
+            stats_UpdateInteger( p_input, STATS_SOUT_SENT_PACKETS, 30, NULL );
+            stats_UpdateInteger( p_input, STATS_SOUT_SENT_BYTES,
                                  p_access->i_sent_bytes, &i_total );
-            stats_UpdateFloat( p_input, "sout_send_bitrate", (float)i_total,
+            stats_UpdateFloat( p_input, STATS_SOUT_SEND_BITRATE, (float)i_total,
                                NULL );
             p_access->i_sent_bytes = 0;
             vlc_object_release( p_input );