Commit a1fe3a13 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files

Qt4 : Various changes especially about StreamInfo => MediaInfo

parent 2ddfa868
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
* $Id$ * $Id$
* *
* Authors: Clément Stenac <zorglub@videolan.org> * 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 * 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 * it under the terms of the GNU General Public License as published by
...@@ -32,29 +33,30 @@ ...@@ -32,29 +33,30 @@
static int ItemChanged( vlc_object_t *p_this, const char *psz_var, static int ItemChanged( vlc_object_t *p_this, const char *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *param ); 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; i_runs = 0;
setWindowTitle( qtr( "Stream information" ) ); p_input = NULL;
QGridLayout *layout = new QGridLayout(this);
setWindowTitle( qtr( "Media information" ) );
QGridLayout *layout = new QGridLayout(this);
IT = new InfoTab( this, p_intf, true ) ; IT = new InfoTab( this, p_intf, true ) ;
QPushButton *closeButton = new QPushButton(qtr("&Close")); QPushButton *closeButton = new QPushButton(qtr("&Close"));
layout->addWidget(IT,0,0,1,3); layout->addWidget(IT,0,0,1,3);
layout->addWidget(closeButton,1,2); layout->addWidget(closeButton,1,2);
BUTTONACT( closeButton, close() ); BUTTONACT( closeButton, close() );
ON_TIMEOUT( update() ); ON_TIMEOUT( update() );
p_input = NULL;
var_AddCallback( THEPL, "item-change", ItemChanged, this ); var_AddCallback( THEPL, "item-change", ItemChanged, this );
readSettings( "StreamInfo" , QSize( 500, 450 ) ); readSettings( "StreamInfo" , QSize( 500, 450 ) );
} }
StreamInfoDialog::~StreamInfoDialog() MediaInfoDialog::~MediaInfoDialog()
{ {
var_DelCallback( THEPL, "item-change", ItemChanged, this ); var_DelCallback( THEPL, "item-change", ItemChanged, this );
writeSettings( "StreamInfo" ); writeSettings( "StreamInfo" );
...@@ -63,12 +65,12 @@ StreamInfoDialog::~StreamInfoDialog() ...@@ -63,12 +65,12 @@ StreamInfoDialog::~StreamInfoDialog()
static int ItemChanged( vlc_object_t *p_this, const char *psz_var, static int ItemChanged( vlc_object_t *p_this, const char *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *param ) 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; p_d->need_update = VLC_TRUE;
return VLC_SUCCESS; return VLC_SUCCESS;
} }
void StreamInfoDialog::update() void MediaInfoDialog::update()
{ {
// Timer runs at 150 ms, dont' update more than 2 times per second // Timer runs at 150 ms, dont' update more than 2 times per second
i_runs++; i_runs++;
...@@ -91,7 +93,7 @@ void StreamInfoDialog::update() ...@@ -91,7 +93,7 @@ void StreamInfoDialog::update()
vlc_object_release( p_input ); vlc_object_release( p_input );
} }
void StreamInfoDialog::close() void MediaInfoDialog::close()
{ {
this->toggleVisible(); this->toggleVisible();
} }
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
* $Id$ * $Id$
* *
* Authors: Clément Stenac <zorglub@videolan.org> * 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 * 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 * it under the terms of the GNU General Public License as published by
...@@ -21,8 +22,8 @@ ...@@ -21,8 +22,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
******************************************************************************/ ******************************************************************************/
#ifndef _STREAMINFO_DIALOG_H_ #ifndef _MEDIAINFO_DIALOG_H_
#define _STREAMINFO_DIALOG_H_ #define _MEDIAINFO_DIALOG_H_
#include "util/qvlcframe.hpp" #include "util/qvlcframe.hpp"
#include <QTabWidget> #include <QTabWidget>
...@@ -30,14 +31,14 @@ ...@@ -30,14 +31,14 @@
class InfoTab; class InfoTab;
class StreamInfoDialog : public QVLCFrame class MediaInfoDialog : public QVLCFrame
{ {
Q_OBJECT; Q_OBJECT;
public: public:
static StreamInfoDialog * getInstance( intf_thread_t *p_intf ) static MediaInfoDialog * getInstance( intf_thread_t *p_intf )
{ {
if( !instance) if( !instance)
instance = new StreamInfoDialog( p_intf); instance = new MediaInfoDialog( p_intf);
return instance; return instance;
} }
static void killInstance() static void killInstance()
...@@ -45,13 +46,13 @@ public: ...@@ -45,13 +46,13 @@ public:
if( instance ) delete instance; if( instance ) delete instance;
instance= NULL; instance= NULL;
} }
virtual ~StreamInfoDialog(); virtual ~MediaInfoDialog();
bool need_update; bool need_update;
private: private:
StreamInfoDialog( intf_thread_t * ); MediaInfoDialog( intf_thread_t * );
input_thread_t *p_input; input_thread_t *p_input;
InfoTab *IT; InfoTab *IT;
static StreamInfoDialog *instance; static MediaInfoDialog *instance;
int i_runs; int i_runs;
public slots: public slots:
void update(); void update();
......
...@@ -61,7 +61,7 @@ DialogsProvider::DialogsProvider( intf_thread_t *_p_intf ) : ...@@ -61,7 +61,7 @@ DialogsProvider::DialogsProvider( intf_thread_t *_p_intf ) :
DialogsProvider::~DialogsProvider() DialogsProvider::~DialogsProvider()
{ {
PlaylistDialog::killInstance(); PlaylistDialog::killInstance();
StreamInfoDialog::killInstance(); MediaInfoDialog::killInstance();
} }
void DialogsProvider::customEvent( QEvent *event ) void DialogsProvider::customEvent( QEvent *event )
...@@ -88,7 +88,7 @@ void DialogsProvider::customEvent( QEvent *event ) ...@@ -88,7 +88,7 @@ void DialogsProvider::customEvent( QEvent *event )
case INTF_DIALOG_MISCPOPUPMENU: case INTF_DIALOG_MISCPOPUPMENU:
popupMenu( de->i_dialog ); break; popupMenu( de->i_dialog ); break;
case INTF_DIALOG_FILEINFO: case INTF_DIALOG_FILEINFO:
streaminfoDialog(); break; MediaInfoDialog(); break;
case INTF_DIALOG_INTERACTION: case INTF_DIALOG_INTERACTION:
doInteraction( de->p_arg ); break; doInteraction( de->p_arg ); break;
case INTF_DIALOG_VLM: case INTF_DIALOG_VLM:
...@@ -159,9 +159,9 @@ void DialogsProvider::quit() ...@@ -159,9 +159,9 @@ void DialogsProvider::quit()
QApplication::quit(); QApplication::quit();
} }
void DialogsProvider::streaminfoDialog() void DialogsProvider::MediaInfoDialog()
{ {
StreamInfoDialog::getInstance( p_intf )->toggleVisible(); MediaInfoDialog::getInstance( p_intf )->toggleVisible();
} }
void DialogsProvider::streamingDialog() void DialogsProvider::streamingDialog()
......
...@@ -74,7 +74,7 @@ private: ...@@ -74,7 +74,7 @@ private:
public slots: public slots:
void playlistDialog(); void playlistDialog();
void bookmarksDialog(); void bookmarksDialog();
void streaminfoDialog(); void MediaInfoDialog();
void prefsDialog(); void prefsDialog();
void extendedDialog(); void extendedDialog();
void messagesDialog(); void messagesDialog();
......
...@@ -176,7 +176,7 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, MainInterface *mi, ...@@ -176,7 +176,7 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, MainInterface *mi,
menu->addSeparator(); menu->addSeparator();
} }
DP_SADD( qtr("Messages" ), "", "", messagesDialog() ); DP_SADD( qtr("Messages" ), "", "", messagesDialog() );
DP_SADD( qtr("Information") , "", "", streaminfoDialog() ); DP_SADD( qtr("Information") , "", "", MediaInfoDialog() );
DP_SADD( qtr("Bookmarks"), "", "", bookmarksDialog() ); DP_SADD( qtr("Bookmarks"), "", "", bookmarksDialog() );
DP_SADD( qtr("Extended settings"), "","",extendedDialog() ); DP_SADD( qtr("Extended settings"), "","",extendedDialog() );
if( mi ) if( mi )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment