Forgot that for Qt

diff --git a/configure.ac b/configure.ac
index 3f9921c403be43f86a9038cc8289d6b8f0ef8e3c..5f662743fabd5f4b69f1917714e7ee77c9c160c8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4636,6 +4636,7 @@ AC_ARG_ENABLE(qt4,
          VLC_ADD_LDFLAGS([qt4],[$QT4_LIBS])
          VLC_ADD_CXXFLAGS([qt4],[$QT4_CFLAGS])
          MOC=`$PKG_CONFIG --variable=exec_prefix QtCore`/bin/moc
+         RCC=`$PKG_CONFIG --variable=exec_prefix QtCore`/bin/rcc
          UIC=`$PKG_CONFIG --variable=exec_prefix QtCore`/bin/uic],
        [AC_MSG_WARN(QT4 library not found)])
    fi])
@@ -5445,6 +5446,7 @@ AC_SUBST(ARCH)
 AC_SUBST(ALIASES)
 AC_SUBST(ASM)
 AC_SUBST(MOC)
+AC_SUBST(RCC)
 AC_SUBST(UIC)
 AC_SUBST(WINDRES)
 AC_SUBST(MOZILLA_SDK_PATH)

diff --git a/modules/demux/ts.c b/modules/demux/ts.c
index 20f760ca51f57823e0eb2be6f40ecadad039e2f0..d73fe0e9e98f132531c6f961c01f1b79bfd9cf0e 100644 (file)
--- a/modules/demux/ts.c
+++ b/modules/demux/ts.c
@@ -2433,8 +2433,8 @@ static void SDTCallBack( demux_t *p_demux, dvbpsi_sdt_t *p_sdt )
                 msg_Dbg( p_demux, "    - type=%d provider=%s name=%s",
                         pD->i_service_type, str1, str2 );
 
-                vlc_meta_Add( p_meta, "Name", str2 );
-                vlc_meta_Add( p_meta, "Provider", str1 );
+                vlc_meta_SetTitle( p_meta, str2 );
+                vlc_meta_SetProvider( p_meta, str1 );
                 if( pD->i_service_type >= 0x01 && pD->i_service_type <= 0x10 )
                     vlc_meta_Add( p_meta, "Type", psz_type[pD->i_service_type] );
             }
@@ -2451,7 +2451,6 @@ static void SDTCallBack( demux_t *p_demux, dvbpsi_sdt_t *p_sdt )
         else
             vlc_meta_Add( p_meta, "Status", "Unknown" );
 
-
         es_out_Control( p_demux->out, ES_OUT_SET_GROUP_META,
                         p_srv->i_service_id, p_meta );
         vlc_meta_Delete( p_meta );
@@ -2622,7 +2621,7 @@ static void EITCallBack( demux_t *p_demux, dvbpsi_eit_t *p_eit )
 
         if( p_evt->i_running_status == 0x04 )
         {
-            vlc_meta_Add( p_meta, VLC_META_NOW_PLAYING, psz_name );
+            vlc_meta_SetNowPlaying( p_meta, psz_name );
             b_event_active = VLC_TRUE;
         }
 
@@ -2631,7 +2630,7 @@ static void EITCallBack( demux_t *p_demux, dvbpsi_eit_t *p_eit )
     }
 
     if( !b_event_active )
-        vlc_meta_Add( p_meta, VLC_META_NOW_PLAYING, "" );
+        vlc_meta_SetNowPlaying( p_meta, "" );
     es_out_Control( p_demux->out, ES_OUT_SET_GROUP_META,
                     p_eit->i_service_id, p_meta );
     vlc_meta_Delete( p_meta );

diff --git a/src/input/es_out.c b/src/input/es_out.c
index a76883f11ab6b3332218612802945b251a4da468..d3bd5c256238f9a1ca284dd0be22f5824729be79 100644 (file)
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -565,7 +565,7 @@ static void EsOutProgramMeta( es_out_t *out, int i_group, vlc_meta_t *p_meta )
     es_out_pgrm_t     *p_pgrm = NULL;
     input_thread_t    *p_input = p_sys->p_input;
     char              *psz_cat = malloc( strlen(_("Program")) + 10 );
-    char              *psz_name = NULL;
+    char              *psz_title = NULL;
     char              *psz_now_playing = NULL;
     char              *psz_provider = NULL;
     int i;
@@ -573,10 +573,11 @@ static void EsOutProgramMeta( es_out_t *out, int i_group, vlc_meta_t *p_meta )
     msg_Dbg( p_input, "EsOutProgramMeta: number=%d", i_group );
     sprintf( psz_cat, "%s %d", _("Program"), i_group );
 
-//    if( p_meta->psz_provider) psz_provider = p_meta->psz_provider;
+    if( p_meta->psz_title ) psz_title = p_meta->psz_title;
+    if( p_meta->psz_provider) psz_provider = p_meta->psz_provider;
     if( p_meta->psz_nowplaying ) psz_now_playing = p_meta->psz_nowplaying;
 
-    if( !psz_name && !psz_now_playing )
+    if( !psz_title && !psz_now_playing )
     {
         free( psz_cat );
         return;
@@ -595,7 +596,7 @@ static void EsOutProgramMeta( es_out_t *out, int i_group, vlc_meta_t *p_meta )
         p_pgrm = EsOutProgramAdd( out, i_group );
 
     /* Update the description text of the program */
-    if( psz_name && *psz_name )
+    if( psz_title && *psz_title )
     {
         vlc_value_t val;
         vlc_value_t text;
@@ -606,13 +607,13 @@ static void EsOutProgramMeta( es_out_t *out, int i_group, vlc_meta_t *p_meta )
 
         if( psz_provider && *psz_provider )
         {
-            asprintf( &text.psz_string, "%s [%s]", psz_name, psz_provider );
+            asprintf( &text.psz_string, "%s [%s]", psz_title, psz_provider );
             var_Change( p_input, "program", VLC_VAR_ADDCHOICE, &val, &text );
             free( text.psz_string );
         }
         else
         {
-            text.psz_string = psz_name;
+            text.psz_string = psz_title;
             var_Change( p_input, "program", VLC_VAR_ADDCHOICE, &val, &text );
         }
     }
@@ -623,8 +624,8 @@ static void EsOutProgramMeta( es_out_t *out, int i_group, vlc_meta_t *p_meta )
 
         if( p_sys->p_pgrm == p_pgrm )
         {
-            input_Control( p_input, INPUT_ADD_INFO, _(VLC_META_INFO_CAT),
-                           _(VLC_META_NOW_PLAYING), "%s", psz_now_playing );
+            vlc_meta_SetNowPlaying( p_input->input.p_item->p_meta,
+                                    psz_now_playing );
         }
     }
     free( psz_cat );