VLC_API char * input_item_GetName( input_item_t * p_i ) VLC_USED;
VLC_API char * input_item_GetTitleFbName( input_item_t * p_i ) VLC_USED;
VLC_API char * input_item_GetURI( input_item_t * p_i ) VLC_USED;
+VLC_API char * input_item_GetNowPlayingFb( input_item_t *p_item ) VLC_USED;
VLC_API void input_item_SetURI( input_item_t * p_i, const char *psz_uri );
VLC_API mtime_t input_item_GetDuration( input_item_t * p_i );
VLC_API void input_item_SetDuration( input_item_t * p_i, mtime_t i_duration );
INPUT_META(URL)
INPUT_META(Language)
INPUT_META(NowPlaying)
+INPUT_META(ESNowPlaying)
INPUT_META(Publisher)
INPUT_META(EncodedBy)
INPUT_META(ArtworkURL)
vlc_meta_URL,
vlc_meta_Language,
vlc_meta_NowPlaying,
+ vlc_meta_ESNowPlaying,
vlc_meta_Publisher,
vlc_meta_EncodedBy,
vlc_meta_ArtworkURL,
[vlc_meta_URL] = libvlc_meta_URL,
[vlc_meta_Language] = libvlc_meta_Language,
[vlc_meta_NowPlaying] = libvlc_meta_NowPlaying,
+ [vlc_meta_ESNowPlaying] = libvlc_meta_NowPlaying,
[vlc_meta_Publisher] = libvlc_meta_Publisher,
[vlc_meta_EncodedBy] = libvlc_meta_EncodedBy,
[vlc_meta_ArtworkURL] = libvlc_meta_ArtworkURL,
char *libvlc_media_get_meta( libvlc_media_t *p_md, libvlc_meta_t e_meta )
{
- char *psz_meta = input_item_GetMeta( p_md->p_input_item,
- libvlc_to_vlc_meta[e_meta] );
- /* Should be integrated in core */
- if( psz_meta == NULL && e_meta == libvlc_meta_Title
- && p_md->p_input_item->psz_name != NULL )
- psz_meta = strdup( p_md->p_input_item->psz_name );
+ char *psz_meta = NULL;
+ if( e_meta == libvlc_meta_NowPlaying )
+ {
+ psz_meta = input_item_GetNowPlayingFb( p_md->p_input_item );
+ }
+ else
+ {
+ psz_meta = input_item_GetMeta( p_md->p_input_item,
+ libvlc_to_vlc_meta[e_meta] );
+ /* Should be integrated in core */
+ if( psz_meta == NULL && e_meta == libvlc_meta_Title
+ && p_md->p_input_item->psz_name != NULL )
+ psz_meta = strdup( p_md->p_input_item->psz_name );
+ }
return psz_meta;
}
}
/* Playing something ... */
- if( input_item_GetNowPlaying( p_item ) )
- psz_title = input_item_GetNowPlaying( p_item );
+ if( input_item_GetNowPlayingFb( p_item ) )
+ psz_title = input_item_GetNowPlayingFb( p_item );
else
psz_title = input_item_GetTitleFbName( p_item );
if( EMPTY_STR( psz_title ) )
}
/* Update now playing */
- input_item_SetNowPlaying( p_input->p->p_item, p_pgrm->psz_now_playing );
+ input_item_SetESNowPlaying( p_input->p->p_item, p_pgrm->psz_now_playing );
input_item_SetPublisher( p_input->p->p_item, p_pgrm->psz_publisher );
input_SendEventMeta( p_input );
/* Check against empty meta data (empty for what we handle) */
if( !vlc_meta_Get( p_meta, vlc_meta_Title) &&
- !vlc_meta_Get( p_meta, vlc_meta_NowPlaying) &&
+ !vlc_meta_Get( p_meta, vlc_meta_ESNowPlaying) &&
!vlc_meta_Get( p_meta, vlc_meta_Publisher) &&
vlc_meta_GetExtraCount( p_meta ) <= 0 )
{
if( p_pgrm == p_sys->p_pgrm )
{
- input_item_SetNowPlaying( p_input->p->p_item, p_pgrm->psz_now_playing );
+ input_item_SetESNowPlaying( p_input->p->p_item, p_pgrm->psz_now_playing );
input_SendEventMeta( p_input );
}
if( p_pgrm->psz_now_playing )
{
input_Control( p_input, INPUT_ADD_INFO, psz_cat,
- vlc_meta_TypeToLocalizedString(vlc_meta_NowPlaying), "%s",
+ vlc_meta_TypeToLocalizedString(vlc_meta_ESNowPlaying), "%s",
p_pgrm->psz_now_playing );
}
else
{
input_Control( p_input, INPUT_DEL_INFO, psz_cat,
- vlc_meta_TypeToLocalizedString(vlc_meta_NowPlaying) );
+ vlc_meta_TypeToLocalizedString(vlc_meta_ESNowPlaying) );
}
free( psz_cat );
/* Remove 'Now playing' info as it is probably outdated */
input_item_SetNowPlaying( p_item, NULL );
+ input_item_SetESNowPlaying( p_item, NULL );
input_SendEventMeta( p_input );
/* */
}
}
+char *input_item_GetNowPlayingFb( input_item_t *p_item )
+{
+ char *psz_meta = input_item_GetMeta( p_item, vlc_meta_NowPlaying );
+ if( !psz_meta || strlen( psz_meta ) == 0 )
+ {
+ free( psz_meta );
+ return input_item_GetMeta( p_item, vlc_meta_ESNowPlaying );
+ }
+
+ return psz_meta;
+}
bool input_item_IsPreparsed( input_item_t *p_item )
{
[vlc_meta_Setting] = N_("Setting"),
[vlc_meta_URL] = N_("URL"),
[vlc_meta_Language] = N_("Language"),
+ [vlc_meta_ESNowPlaying]= N_("Now Playing"),
[vlc_meta_NowPlaying] = N_("Now Playing"),
[vlc_meta_Publisher] = N_("Publisher"),
[vlc_meta_EncodedBy] = N_("Encoded by"),
input_item_t *p_item = input_GetItem( p_resource->p_input );
- char *psz_nowplaying = input_item_GetNowPlaying( p_item );
+ char *psz_nowplaying = input_item_GetNowPlayingFb( p_item );
if( psz_nowplaying && *psz_nowplaying )
{
vout_DisplayTitle( p_vout, psz_nowplaying );
input_item_GetInfo
input_item_GetMeta
input_item_GetName
+input_item_GetNowPlayingFb
input_item_GetTitleFbName
input_item_GetURI
input_item_HasErrorWhenReading
write_meta(stream, item, vlc_meta_TrackNumber);
break;
case 'p':
- write_meta(stream, item, vlc_meta_NowPlaying);
+ if (item == NULL)
+ break;
+ {
+ char *value = input_item_GetNowPlayingFb(item);
+ if (value == NULL)
+ break;
+
+ fputs(value, stream);
+ free(value);
+ }
break;
case 'r':
write_meta(stream, item, vlc_meta_Rating);
case 'Z':
if (item == NULL)
break;
- if (write_meta(stream, item, vlc_meta_NowPlaying) == EOF)
{
- char *title = input_item_GetTitleFbName(item);
+ char *value = input_item_GetNowPlayingFb(item);
+ if (value == NULL)
+ break;
- if (write_meta(stream, item, vlc_meta_Artist) >= 0
- && title != NULL)
- fputs(" - ", stream);
+ int ret = fputs(value, stream);
+ free(value);
- if (title != NULL)
+ if (ret == EOF)
{
- fputs(title, stream);
- free(title);
+ char *title = input_item_GetTitleFbName(item);
+
+ if (write_meta(stream, item, vlc_meta_Artist) >= 0
+ && title != NULL)
+ fputs(" - ", stream);
+
+ if (title != NULL)
+ {
+ fputs(title, stream);
+ free(title);
+ }
}
}
break;
*/
int vout_OSDEpg(vout_thread_t *vout, input_item_t *input)
{
- char *now_playing = input_item_GetNowPlaying(input);
+ char *now_playing = input_item_GetNowPlayingFb(input);
vlc_epg_t *epg = NULL;
vlc_mutex_lock(&input->lock);