vlc | branch: master | Tristan Matthews <le.business...@gmail.com> | Wed Jul 2 17:28:02 2014 -0400| [a1e5e6422d04cd3380bc5b10c86713fef0832aa3] | committer: Tristan Matthews
Fix build for C++11 C++11 requires a space between literal and identifier > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a1e5e6422d04cd3380bc5b10c86713fef0832aa3 --- modules/gui/qt4/components/extended_panels.cpp | 4 ++-- modules/gui/skins2/src/dialogs.cpp | 2 +- modules/video_filter/atmo/AtmoLiveView.cpp | 4 ++-- modules/video_filter/atmo/atmo.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/gui/qt4/components/extended_panels.cpp b/modules/gui/qt4/components/extended_panels.cpp index 84d16ae..bbff25a 100644 --- a/modules/gui/qt4/components/extended_panels.cpp +++ b/modules/gui/qt4/components/extended_panels.cpp @@ -557,7 +557,7 @@ void ExtVideo::setWidgetValue( QObject *widget ) else if( lineedit ) { char str[30]; - snprintf( str, sizeof(str), "%06"PRIX64, val.i_int ); + snprintf( str, sizeof(str), "%06" PRIX64, val.i_int ); lineedit->setText( str ); } else if( combobox ) combobox->setCurrentIndex( @@ -750,7 +750,7 @@ void ExtV4l2::Refresh( void ) QString name = qtr( vartext.psz_string ); free( vartext.psz_string ); - msg_Dbg( p_intf, "v4l2 control \"%"PRIx64"\": %s (%s)", + msg_Dbg( p_intf, "v4l2 control \"%" PRIx64 "\": %s (%s)", val.p_list->p_values[i].i_int, psz_var, qtu( name ) ); int i_type = var_Type( p_obj, psz_var ); diff --git a/modules/gui/skins2/src/dialogs.cpp b/modules/gui/skins2/src/dialogs.cpp index 3bda3b9..fc4db08 100644 --- a/modules/gui/skins2/src/dialogs.cpp +++ b/modules/gui/skins2/src/dialogs.cpp @@ -212,7 +212,7 @@ void Dialogs::showChangeSkin() void Dialogs::showPlaylistLoad() { showFileGeneric( _("Open playlist"), - _("Playlist Files|"EXTENSIONS_PLAYLIST"|" + _("Playlist Files|" EXTENSIONS_PLAYLIST "|" "All Files|*"), showPlaylistLoadCB, kOPEN ); } diff --git a/modules/video_filter/atmo/AtmoLiveView.cpp b/modules/video_filter/atmo/AtmoLiveView.cpp index 987bb61..8cef916 100644 --- a/modules/video_filter/atmo/AtmoLiveView.cpp +++ b/modules/video_filter/atmo/AtmoLiveView.cpp @@ -98,7 +98,7 @@ DWORD CAtmoLiveView::Execute(void) if( frameDelay > 0 ) do_sleep( frameDelay ); #if defined(_ATMO_VLC_PLUGIN_) - msg_Dbg( m_pLog, "First Packet got %"PRId64" ms", (get_time - t) / 1000 ); + msg_Dbg( m_pLog, "First Packet got %" PRId64 " ms", (get_time - t) / 1000 ); #endif } @@ -139,7 +139,7 @@ DWORD CAtmoLiveView::Execute(void) if( frameDelay > 0 ) do_sleep( frameDelay ); #if defined(_ATMO_VLC_PLUGIN_) - msg_Dbg( m_pLog, "got delayed packet %"PRId64" ms", (mdate() - t) / 1000 ); + msg_Dbg( m_pLog, "got delayed packet %" PRId64 " ms", (mdate() - t) / 1000 ); #endif continue; } diff --git a/modules/video_filter/atmo/atmo.cpp b/modules/video_filter/atmo/atmo.cpp index 518e2c5..54fab7d 100644 --- a/modules/video_filter/atmo/atmo.cpp +++ b/modules/video_filter/atmo/atmo.cpp @@ -2448,7 +2448,7 @@ static int AtmoSettingsCallback( vlc_object_t *, char const *psz_var, if(p_atmo_config) { - msg_Dbg(p_filter, "apply AtmoSettingsCallback %s (int: %"PRId64" -> %"PRId64")", + msg_Dbg(p_filter, "apply AtmoSettingsCallback %s (int: %" PRId64 " -> %" PRId64 ")", psz_var, oldval.i_int, newval.i_int _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits