statistics to 64bit

[vlc] / modules / gui / qt4 / components / info_panels.cpp

diff --git a/modules/gui/qt4/components/info_panels.cpp b/modules/gui/qt4/components/info_panels.cpp
index cc5c9a13f04050b87c54a843b860b509e71cf8ae..506e6535992afd1efaceb4515559f3745b41db6d 100644 (file)
--- a/modules/gui/qt4/components/info_panels.cpp
+++ b/modules/gui/qt4/components/info_panels.cpp
@@ -23,6 +23,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#define __STDC_FORMAT_MACROS 1
+#define __STDC_CONSTANT_MACROS 1
+
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
@@ -234,14 +237,13 @@ void MetaPanel::update( input_item_t *p_item )
 
     QString file;
     char *psz_art = input_item_GetArtURL( p_item );
-    if( psz_art && !strncmp( psz_art, "file://", 7 ) &&
-                decode_URI( psz_art + 7 ) )
-#ifdef WIN32
-        file = qfu( psz_art + 8 ); // Remove extra / on Win32 URI.
-#else
-        file = qfu( psz_art + 7 );
-#endif
-    free( psz_art );
+    if( psz_art )
+    {
+        char *psz = make_path( psz_art );
+        free( psz_art );
+        file = qfu( psz );
+        free( psz );
+    }
 
     art_cover->showArtUpdate( file );
 
@@ -511,10 +513,10 @@ InputStatsPanel::InputStatsPanel( QWidget *parent,
     CREATE_CATEGORY( streaming, qtr("Output/Written/Sent") );
 
     CREATE_AND_ADD_TO_CAT( read_media_stat, qtr("Media data size"),
-                           "0", input , "kB" );
+                           "0", input , "KiB" );
     CREATE_AND_ADD_TO_CAT( input_bitrate_stat, qtr("Input bitrate"),
                            "0", input, "kb/s" );
-    CREATE_AND_ADD_TO_CAT( demuxed_stat, qtr("Demuxed data size"), "0", input, "kB") ;
+    CREATE_AND_ADD_TO_CAT( demuxed_stat, qtr("Demuxed data size"), "0", input, "KiB") ;
     CREATE_AND_ADD_TO_CAT( stream_bitrate_stat, qtr("Content bitrate"),
                            "0", input, "kb/s" );
     CREATE_AND_ADD_TO_CAT( corrupted_stat, qtr("Discarded (corrupted)"),
@@ -531,7 +533,7 @@ InputStatsPanel::InputStatsPanel( QWidget *parent,
 
     CREATE_AND_ADD_TO_CAT( send_stat, qtr("Sent"), "0", streaming, qtr("packets") );
     CREATE_AND_ADD_TO_CAT( send_bytes_stat, qtr("Sent"),
-                           "0", streaming, "kB" );
+                           "0", streaming, "KiB" );
     CREATE_AND_ADD_TO_CAT( send_bitrate_stat, qtr("Upstream rate"),
                            "0", streaming, "kb/s" );
 
@@ -567,33 +569,33 @@ void InputStatsPanel::update( input_item_t *p_item )
 #define UPDATE( widget, format, calc... ) \
     { QString str; widget->setText( 1 , str.sprintf( format, ## calc ) );  }
 
-    UPDATE( read_media_stat, "%8.0f",
-            (float)(p_item->p_stats->i_read_bytes)/1000);
+    UPDATE( read_media_stat, "%"PRId64,
+            (p_item->p_stats->i_read_bytes / 1024 ) );
     UPDATE( input_bitrate_stat, "%6.0f",
-                    (float)(p_item->p_stats->f_input_bitrate * 8000 ));
-    UPDATE( demuxed_stat, "%8.0f",
-                    (float)(p_item->p_stats->i_demux_read_bytes)/1000 );
+                    (float)(p_item->p_stats->f_input_bitrate *  8000  ));
+    UPDATE( demuxed_stat, "%"PRId64,
+                    (p_item->p_stats->i_demux_read_bytes / 1024 ) );
     UPDATE( stream_bitrate_stat, "%6.0f",
-                    (float)(p_item->p_stats->f_demux_bitrate * 8000 ));
-    UPDATE( corrupted_stat, "%5i", p_item->p_stats->i_demux_corrupted );
-    UPDATE( discontinuity_stat, "%5i", p_item->p_stats->i_demux_discontinuity );
+                    (float)(p_item->p_stats->f_demux_bitrate *  8000  ));
+    UPDATE( corrupted_stat, "%"PRId64, p_item->p_stats->i_demux_corrupted );
+    UPDATE( discontinuity_stat, "%"PRId64, p_item->p_stats->i_demux_discontinuity );
 
     /* Video */
-    UPDATE( vdecoded_stat, "%5i", p_item->p_stats->i_decoded_video );
-    UPDATE( vdisplayed_stat, "%5i", p_item->p_stats->i_displayed_pictures );
-    UPDATE( vlost_frames_stat, "%5i", p_item->p_stats->i_lost_pictures );
+    UPDATE( vdecoded_stat, "%"PRId64, p_item->p_stats->i_decoded_video );
+    UPDATE( vdisplayed_stat, "%"PRId64, p_item->p_stats->i_displayed_pictures );
+    UPDATE( vlost_frames_stat, "%"PRId64, p_item->p_stats->i_lost_pictures );
 
     /* Sout */
-    UPDATE( send_stat, "%5i", p_item->p_stats->i_sent_packets );
-    UPDATE( send_bytes_stat, "%8.0f",
-            (float)(p_item->p_stats->i_sent_bytes)/1000 );
+    UPDATE( send_stat, "%"PRId64, p_item->p_stats->i_sent_packets );
+    UPDATE( send_bytes_stat, "%"PRId64,
+            (p_item->p_stats->i_sent_bytes)/ 1024 );
     UPDATE( send_bitrate_stat, "%6.0f",
-            (float)(p_item->p_stats->f_send_bitrate*8)*1000 );
+            (float)(p_item->p_stats->f_send_bitrate * 8000 ) );
 
     /* Audio*/
-    UPDATE( adecoded_stat, "%5i", p_item->p_stats->i_decoded_audio );
-    UPDATE( aplayed_stat, "%5i", p_item->p_stats->i_played_abuffers );
-    UPDATE( alost_stat, "%5i", p_item->p_stats->i_lost_abuffers );
+    UPDATE( adecoded_stat, "%"PRId64, p_item->p_stats->i_decoded_audio );
+    UPDATE( aplayed_stat, "%"PRId64, p_item->p_stats->i_played_abuffers );
+    UPDATE( alost_stat, "%"PRId64, p_item->p_stats->i_lost_abuffers );
 
 #undef UPDATE