summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-11-10 16:03:09 (UTC)
committer llornkcor <llornkcor>2002-11-10 16:03:09 (UTC)
commitcb4821802897bbf6e06be3b2608656e05db68b96 (patch) (unidiff)
tree672351f10dfb9a6bd13f753d876c975a39b74270
parentee6938139a5f8f24da901ab5a41930a98af00d44 (diff)
downloadopie-cb4821802897bbf6e06be3b2608656e05db68b96.zip
opie-cb4821802897bbf6e06be3b2608656e05db68b96.tar.gz
opie-cb4821802897bbf6e06be3b2608656e05db68b96.tar.bz2
display loaded playlist in caption at start
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayer.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp
index 8b0f501..1f19b30 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp
@@ -53,25 +53,28 @@ MediaPlayer::MediaPlayer( QObject *parent, const char *name )
53 connect( audioUI, SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) ); 53 connect( audioUI, SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) );
54 connect( audioUI, SIGNAL( lessClicked() ), this, SLOT( startDecreasingVolume() ) ); 54 connect( audioUI, SIGNAL( lessClicked() ), this, SLOT( startDecreasingVolume() ) );
55 connect( audioUI, SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) ); 55 connect( audioUI, SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) );
56 connect( audioUI, SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) ); 56 connect( audioUI, SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) );
57 57
58 connect( videoUI, SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) ); 58 connect( videoUI, SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) );
59 connect( videoUI, SIGNAL( lessClicked() ), this, SLOT( startDecreasingVolume() ) ); 59 connect( videoUI, SIGNAL( lessClicked() ), this, SLOT( startDecreasingVolume() ) );
60 connect( videoUI, SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) ); 60 connect( videoUI, SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) );
61 connect( videoUI, SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) ); 61 connect( videoUI, SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) );
62 62
63 volControl = new VolumeControl; 63 volControl = new VolumeControl;
64 xineControl = new XineControl(); 64 xineControl = new XineControl();
65 playList->setCaption(tr("OpiePlayer")); 65 Config cfg( "OpiePlayer" );
66 cfg.setGroup("PlayList");
67 QString currentPlaylist = cfg.readEntry( "CurrentPlaylist", "default");
68 playList->setCaption( tr( "OpiePlayer: " ) + QFileInfo(currentPlaylist).baseName() );
66} 69}
67 70
68MediaPlayer::~MediaPlayer() { 71MediaPlayer::~MediaPlayer() {
69 delete xineControl; 72 delete xineControl;
70 delete volControl; 73 delete volControl;
71} 74}
72 75
73void MediaPlayer::pauseCheck( bool b ) { 76void MediaPlayer::pauseCheck( bool b ) {
74 if ( b && !mediaPlayerState->playing() ) { 77 if ( b && !mediaPlayerState->playing() ) {
75 mediaPlayerState->setPaused( FALSE ); 78 mediaPlayerState->setPaused( FALSE );
76 } 79 }
77} 80}