From kde-commits  Fri Sep 17 12:26:31 2004
From: Koos Vriezen <koos.vriezen () xs4all ! nl>
Date: Fri, 17 Sep 2004 12:26:31 +0000
To: kde-commits
Subject: kdeextragear-2/kmplayer/src
Message-Id: <20040917122631.5EA1A126BB () office ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=109542401708761

CVS commit by vriezen: 

Argg, just when I wanted a record a nice song from a web stream, replay
after x seconds recording turned out to be broken. First this option was set
too late (which actually saved my recording :), and next it stopped recording
when replaying started.


  M +0 -2      kmplayerconfig.cpp   1.96
  M +2 -1      kmplayerpartbase.cpp   1.78
  M +3 -0      pref.cpp   1.74


--- kdeextragear-2/kmplayer/src/kmplayerconfig.cpp  #1.95:1.96
@@ -537,8 +537,6 @@ KDE_NO_EXPORT void KMPlayerSettings::okP
     // recording
 #if (QT_VERSION < 0x030200)
-    replayoption = ReplayOption (configdialog->m_RecordPage->replay->id (configdialog->m_RecordPage->replay->selected ()));
     recorder = Recorder (configdialog->m_RecordPage->recorder->id (configdialog->m_RecordPage->recorder->selected ()));
 #else
-    replayoption = ReplayOption (configdialog->m_RecordPage->replay->selectedId ());
     recorder = Recorder (configdialog->m_RecordPage->recorder->selectedId ());
 #endif

--- kdeextragear-2/kmplayer/src/kmplayerpartbase.cpp  #1.77:1.78
@@ -330,4 +330,5 @@ void KMPlayer::setSource (KMPlayerSource
     }
     m_process->setSource (source);
+    if (!m_recorder->playing ())
     m_recorder->setSource (source);
     source->init ();

--- kdeextragear-2/kmplayer/src/pref.cpp  #1.73:1.74
@@ -360,8 +360,11 @@ KDE_NO_EXPORT void KMPlayerPrefRecordPag
 #if KDE_IS_VERSION(3,1,90)
         int id = recorder->selectedId ();
+        int replayid = replay->selectedId ();
 #else
         int id = recorder->id (recorder->selected ());
+        int replayid = replay->id (replay->selectedId ());
 #endif
         m_player->settings ()->recorder = KMPlayerSettings::Recorder (id);
+        m_player->settings ()->replayoption = KMPlayerSettings::ReplayOption (replayid);
         RecorderList::iterator it = m_recorders.begin ();
         for (; id > 0 && it != m_recorders.end (); ++it, --id)