Index: Scheduler/Scheduler.cs =================================================================== --- Scheduler/Scheduler.cs (revision 27615) +++ Scheduler/Scheduler.cs (working copy) @@ -890,7 +890,6 @@ { user.CardId = cardInfo.Id; - StartRecordingNotification(RecDetail); SetupRecordingFolder(cardInfo); if (StartRecordingOnDisc(RecDetail, ref user, cardInfo)) @@ -900,7 +899,6 @@ _recordingsInProgressList.Add(RecDetail); - RecordingStartedNotification(RecDetail); SetupQualityControl(RecDetail); WriteMatroskaFile(RecDetail); @@ -1051,22 +1049,6 @@ return cardInfo; } - private void RecordingStartedNotification(RecordingDetail RecDetail) - { - User user = RecDetail.User; - _tvController.Fire(this, - new TvServerEventArgs(TvServerEventType.RecordingStarted, new VirtualCard(user), user, - RecDetail.Schedule, RecDetail.Recording)); - } - - private void StartRecordingNotification(RecordingDetail RecDetail) - { - User user = RecDetail.User; - _tvController.Fire(this, - new TvServerEventArgs(TvServerEventType.StartRecording, new VirtualCard(user), user, - RecDetail.Schedule, null)); - } - private void SetupRecordingFolder(CardDetail cardInfo) { if (cardInfo.Card.RecordingFolder == String.Empty) cardInfo.Card.RecordingFolder = String.Format(@"{0}\Team MediaPortal\MediaPortal TV Server\recordings", @@ -1221,8 +1203,6 @@ { StopRecordOnSeriesSchedule(recording); } - - RecordingEndedNotification(recording); } else { @@ -1244,14 +1224,6 @@ recording.Recording.Persist(); } - private void RecordingEndedNotification(RecordingDetail recording) - { - User user = recording.User; - _tvController.Fire(this, - new TvServerEventArgs(TvServerEventType.RecordingEnded, new VirtualCard(user), user, - recording.Schedule, recording.Recording)); - } - private void StopRecordOnSeriesSchedule(RecordingDetail recording) { Log.Debug("Scheduler: endtime={0}, Program.EndTime={1}, postRecTime={2}", recording.EndTime, recording.Program.EndTime, recording.Schedule.PostRecordInterval); Index: TVController.cs =================================================================== --- TVController.cs (revision 27615) +++ TVController.cs (working copy) @@ -1949,11 +1949,15 @@ { _epgGrabber.Stop(); } + Fire(this, new TvServerEventArgs(TvServerEventType.StartRecording, new VirtualCard(user), user)); + TvResult result = _cards[user.CardId].Recorder.Start(ref user, ref fileName, contentRecording, startTime); if (result == TvResult.Succeeded) { UpdateChannelStatesForUsers(); + Log.Debug("Recorder: RJS Starting recording event."); + Fire(this, new TvServerEventArgs(TvServerEventType.RecordingStarted, new VirtualCard(user), user)); } else { @@ -1980,6 +1984,8 @@ if (result) { UpdateChannelStatesForUsers(); + Log.Debug("RJS: StopRecording Fire Event"); + Fire(this, new TvServerEventArgs(TvServerEventType.RecordingEnded, new VirtualCard(user), user)); } if (_epgGrabber != null && AllCardsIdle) {