* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include "components/info_panels.hpp"
#include "components/interface_widgets.hpp"
+#include <assert.h>
+
#include <QTreeWidget>
-#include <QListView>
-#include <QPushButton>
#include <QHeaderView>
#include <QList>
#include <QStringList>
#include <QLineEdit>
#include <QLabel>
#include <QSpinBox>
-#include <QTabWidget>
/************************************************************************
* Single panels
line++;
/* ART_URL */
- art_cover = new CoverArtLabel( this, VLC_OBJECT( p_intf ) );
+ art_cover = new CoverArtLabel( this, p_intf );
metaLayout->addWidget( art_cover, line, 8, 4, 2, Qt::AlignRight );
/* Settings is unused */
b_inEditMode = false;
}
-MetaPanel::~MetaPanel(){}
-
/**
* Update all the MetaData and art on an "item-changed" event
**/
void MetaPanel::update( input_item_t *p_item )
{
+ if( !p_item )
+ {
+ clear();
+ return;
+ }
+
/* Don't update if you are in edit mode */
if( b_inEditMode ) return;
else p_input = p_item;
free( psz_meta );
/* Name / Title */
- psz_meta = input_item_GetTitle( p_item );
- char *psz_name = input_item_GetName( p_item );
- if( !EMPTY_STR( psz_meta ) )
+ psz_meta = input_item_GetTitleFbName( p_item );
+ if( psz_meta )
+ {
title_text->setText( qfu( psz_meta ) );
- else if( !EMPTY_STR( psz_name ) )
- title_text->setText( qfu( psz_name ) );
- else title_text->setText( "" );
- free( psz_meta );
- free( psz_name );
+ free( psz_meta );
+ }
+ else
+ title_text->setText( "" );
/* URL / URI */
psz_meta = input_item_GetURL( p_item );
if( !EMPTY_STR( psz_meta ) )
- emit uriSet( QString( psz_meta ) );
+ emit uriSet( qfu( psz_meta ) );
else
{
free( psz_meta );
psz_meta = input_item_GetURI( p_item );
if( !EMPTY_STR( psz_meta ) )
- emit uriSet( QString( psz_meta ) );
+ emit uriSet( qfu( psz_meta ) );
}
free( psz_meta );
UPDATE_META( NowPlaying, nowplaying_text );
UPDATE_META( Publisher, publisher_text );
// UPDATE_META( Setting, setting_text );
-// UPDATE_META( EncodedBy, encodedby_text );
+//FIXME this is wrong if has Publisher and EncodedBy fields
+ UPDATE_META( EncodedBy, publisher_text );
UPDATE_META( Date, date_text );
UPDATE_META( TrackNum, seqnum_text );
#undef UPDATE_META_INT
#undef UPDATE_META
- /* Update Art */
- art_cover->update( p_item );
}
/**
PL_LOCK;
p_playlist->p_private = &p_export;
- module_t *p_mod = module_need( p_playlist, "meta writer", NULL, 0 );
+ module_t *p_mod = module_need( p_playlist, "meta writer", NULL, false );
if( p_mod )
module_unneed( p_playlist, p_mod );
PL_UNLOCK;
language_text->clear();
nowplaying_text->clear();
publisher_text->clear();
- art_cover->update( NULL );
setEditMode( false );
+ emit uriSet( "" );
}
/**
**/
void ExtraMetaPanel::update( input_item_t *p_item )
{
- QStringList tempItem;
+ if( !p_item )
+ {
+ clear();
+ return;
+ }
+
QList<QTreeWidgetItem *> items;
extraMetaTree->clear();
{
const char * psz_value = (const char *)vlc_dictionary_value_for_key(
p_dict, ppsz_allkey[i] );
+ QStringList tempItem;
tempItem.append( qfu( ppsz_allkey[i] ) + " : ");
tempItem.append( qfu( psz_value ) );
items.append( new QTreeWidgetItem ( extraMetaTree, tempItem ) );
layout->addWidget(InfoTree, 1, 0 );
}
-InfoPanel::~InfoPanel()
-{
-}
-
/**
* Update the Codecs information on parent->update()
**/
void InfoPanel::update( input_item_t *p_item)
{
+ if( !p_item )
+ {
+ clear();
+ return;
+ }
+
InfoTree->clear();
QTreeWidgetItem *current_item = NULL;
QTreeWidgetItem *child_item = NULL;
CREATE_AND_ADD_TO_CAT( demuxed_stat, qtr("Demuxed"), "0", input, "kB") ;
CREATE_AND_ADD_TO_CAT( stream_bitrate_stat, qtr("Stream bitrate"),
"0", input, "kb/s" );
+ CREATE_AND_ADD_TO_CAT( corrupted_stat, qtr("Corrupted"),
+ "0", input, "" );
+ CREATE_AND_ADD_TO_CAT( discontinuity_stat, qtr("Discontinuities"),
+ "0", input, "" );
CREATE_AND_ADD_TO_CAT( vdecoded_stat, qtr("Decoded blocks"),
"0", video, "" );
"0", video, "" );
CREATE_AND_ADD_TO_CAT( vlost_frames_stat, qtr("Lost frames"),
"0", video, "" );
-// CREATE_AND_ADD_TO_CAT( vfps_stat, qtr("FPS"), "0", video, "" );
CREATE_AND_ADD_TO_CAT( send_stat, qtr("Sent packets"), "0", streaming, "" );
CREATE_AND_ADD_TO_CAT( send_bytes_stat, qtr("Sent bytes"),
"0", audio, "" );
CREATE_AND_ADD_TO_CAT( alost_stat, qtr("Lost buffers"), "0", audio, "" );
+#undef CREATE_AND_ADD_TO_CAT
+#undef CREATE_CATEGORY
+#undef CREATE_TREE_ITEM
+
input->setExpanded( true );
video->setExpanded( true );
streaming->setExpanded( true );
StatsTree->setColumnWidth( 1 , 200 );
layout->addWidget(StatsTree, 1, 0 );
-
- CONNECT( THEMIM->getIM() , statisticsUpdated( input_item_t* ),
- this, update( input_item_t* ) );
-}
-
-InputStatsPanel::~InputStatsPanel()
-{
}
/**
**/
void InputStatsPanel::update( input_item_t *p_item )
{
+ assert( p_item );
vlc_mutex_lock( &p_item->p_stats->lock );
#define UPDATE( widget, format, calc... ) \
(float)(p_item->p_stats->i_demux_read_bytes)/1000 );
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 );
/* 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( vfps_stat, "%5f", p_item->p_stats->i_lost_pictures );
-input_Control( p_input_thread, INPUT_GET_VIDEO_FPS, &f_fps */
/* Sout */
UPDATE( send_stat, "%5i", p_item->p_stats->i_sent_packets );
UPDATE( aplayed_stat, "%5i", p_item->p_stats->i_played_abuffers );
UPDATE( alost_stat, "%5i", p_item->p_stats->i_lost_abuffers );
+#undef UPDATE
+
vlc_mutex_unlock(& p_item->p_stats->lock );
}
void InputStatsPanel::clear()
{
}
+
projects / vlc / blobdiff