* $Id$
*
* Authors: Clément Stenac <zorglub@videolan.org>
+ * Jean-Baptiste Kempf <jb@videolan.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
static int ItemChanged( vlc_object_t *p_this, const char *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *param );
-StreamInfoDialog *StreamInfoDialog::instance = NULL;
+MediaInfoDialog *MediaInfoDialog::instance = NULL;
-StreamInfoDialog::StreamInfoDialog( intf_thread_t *_p_intf ) :QVLCFrame( _p_intf )
+MediaInfoDialog::MediaInfoDialog( intf_thread_t *_p_intf ) :QVLCFrame( _p_intf )
{
i_runs = 0;
- setWindowTitle( qtr( "Stream information" ) );
- QGridLayout *layout = new QGridLayout(this);
+ p_input = NULL;
+ setWindowTitle( qtr( "Media information" ) );
+
+ QGridLayout *layout = new QGridLayout(this);
IT = new InfoTab( this, p_intf, true ) ;
QPushButton *closeButton = new QPushButton(qtr("&Close"));
+
layout->addWidget(IT,0,0,1,3);
layout->addWidget(closeButton,1,2);
BUTTONACT( closeButton, close() );
ON_TIMEOUT( update() );
- p_input = NULL;
var_AddCallback( THEPL, "item-change", ItemChanged, this );
-
readSettings( "StreamInfo" , QSize( 500, 450 ) );
}
-StreamInfoDialog::~StreamInfoDialog()
+MediaInfoDialog::~MediaInfoDialog()
{
var_DelCallback( THEPL, "item-change", ItemChanged, this );
writeSettings( "StreamInfo" );
static int ItemChanged( vlc_object_t *p_this, const char *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *param )
{
- StreamInfoDialog *p_d = (StreamInfoDialog *)param;
+ MediaInfoDialog *p_d = (MediaInfoDialog *)param;
p_d->need_update = VLC_TRUE;
return VLC_SUCCESS;
}
-void StreamInfoDialog::update()
+void MediaInfoDialog::update()
{
// Timer runs at 150 ms, dont' update more than 2 times per second
i_runs++;
vlc_object_release( p_input );
}
-void StreamInfoDialog::close()
+void MediaInfoDialog::close()
{
this->toggleVisible();
}
* $Id$
*
* Authors: Clément Stenac <zorglub@videolan.org>
+ * Jean-Baptiste Kempf <jb@videolan.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
******************************************************************************/
-#ifndef _STREAMINFO_DIALOG_H_
-#define _STREAMINFO_DIALOG_H_
+#ifndef _MEDIAINFO_DIALOG_H_
+#define _MEDIAINFO_DIALOG_H_
#include "util/qvlcframe.hpp"
#include <QTabWidget>
class InfoTab;
-class StreamInfoDialog : public QVLCFrame
+class MediaInfoDialog : public QVLCFrame
{
Q_OBJECT;
public:
- static StreamInfoDialog * getInstance( intf_thread_t *p_intf )
+ static MediaInfoDialog * getInstance( intf_thread_t *p_intf )
{
if( !instance)
- instance = new StreamInfoDialog( p_intf);
+ instance = new MediaInfoDialog( p_intf);
return instance;
}
static void killInstance()
if( instance ) delete instance;
instance= NULL;
}
- virtual ~StreamInfoDialog();
+ virtual ~MediaInfoDialog();
bool need_update;
private:
- StreamInfoDialog( intf_thread_t * );
+ MediaInfoDialog( intf_thread_t * );
input_thread_t *p_input;
InfoTab *IT;
- static StreamInfoDialog *instance;
+ static MediaInfoDialog *instance;
int i_runs;
public slots:
void update();
DialogsProvider::~DialogsProvider()
{
PlaylistDialog::killInstance();
- StreamInfoDialog::killInstance();
+ MediaInfoDialog::killInstance();
}
void DialogsProvider::customEvent( QEvent *event )
case INTF_DIALOG_MISCPOPUPMENU:
popupMenu( de->i_dialog ); break;
case INTF_DIALOG_FILEINFO:
- streaminfoDialog(); break;
+ MediaInfoDialog(); break;
case INTF_DIALOG_INTERACTION:
doInteraction( de->p_arg ); break;
case INTF_DIALOG_VLM:
QApplication::quit();
}
-void DialogsProvider::streaminfoDialog()
+void DialogsProvider::MediaInfoDialog()
{
- StreamInfoDialog::getInstance( p_intf )->toggleVisible();
+ MediaInfoDialog::getInstance( p_intf )->toggleVisible();
}
void DialogsProvider::streamingDialog()
public slots:
void playlistDialog();
void bookmarksDialog();
- void streaminfoDialog();
+ void MediaInfoDialog();
void prefsDialog();
void extendedDialog();
void messagesDialog();
menu->addSeparator();
}
DP_SADD( qtr("Messages" ), "", "", messagesDialog() );
- DP_SADD( qtr("Information") , "", "", streaminfoDialog() );
+ DP_SADD( qtr("Information") , "", "", MediaInfoDialog() );
DP_SADD( qtr("Bookmarks"), "", "", bookmarksDialog() );
DP_SADD( qtr("Extended settings"), "","",extendedDialog() );
if( mi )