Reply to thread

Message

<blockquote data-quote="doskabouter" data-source="post: 1202394" data-attributes="member: 98267">[USER=82144]@mm1352000[/USER] Pull request made: <a href="https://github.com/MediaPortal/MediaPortal-1/pull/107" target="_blank">https://github.com/MediaPortal/MediaPortal-1/pull/107</a>Took a bit of time because it wasn't easy to get things compiled (missing serveragent stuff, skipping compilation due to wrong configuration settings in solution etc).Couple of questions:- I couldn't find a piece of code which is present in the master branch of MP1, and not in the EXP TVE3.5 branch, so I'm not able to fully merge my changes into the TVE3.5 branch.it's this piece (in TvRecorded.cs, LoadDirectory method)[CODE]&nbsp; if (singleRecording)&nbsp; {&nbsp; &nbsp; item = BuildItemFromRecording(folder, channels.FirstOrDefault(chan =&gt; folder.IdChannel == chan.IdChannel));&nbsp; &nbsp; TimeSpan ts = folder.EndTime - folder.StartTime;&nbsp; &nbsp; item.Label2 = String.Format(&quot;{0} ({1})&quot;,&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&nbsp; Utils.GetNamedDate(folder.StartTime),&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&nbsp; Utils.SecondsToHMString((int)ts.TotalSeconds));&nbsp; }[/CODE]- I can't imagine that I'm the first one with changes for the TVPlugin, but I didn't see any commits for over 3 years.Are other changes in separate branches, and are you going to do a massive merge when the 3.5 version is stable, or am I missing something?Paul</blockquote>

[QUOTE="doskabouter, post: 1202394, member: 98267"] [USER=82144]@mm1352000[/USER] Pull request made: [URL]https://github.com/MediaPortal/MediaPortal-1/pull/107[/URL] Took a bit of time because it wasn't easy to get things compiled (missing serveragent stuff, skipping compilation due to wrong configuration settings in solution etc). Couple of questions: - I couldn't find a piece of code which is present in the master branch of MP1, and not in the EXP TVE3.5 branch, so I'm not able to fully merge my changes into the TVE3.5 branch. it's this piece (in TvRecorded.cs, LoadDirectory method) [CODE] if (singleRecording) { item = BuildItemFromRecording(folder, channels.FirstOrDefault(chan => folder.IdChannel == chan.IdChannel)); TimeSpan ts = folder.EndTime - folder.StartTime; item.Label2 = String.Format("{0} ({1})", Utils.GetNamedDate(folder.StartTime), Utils.SecondsToHMString((int)ts.TotalSeconds)); } [/CODE] - I can't imagine that I'm the first one with changes for the TVPlugin, but I didn't see any commits for over 3 years. Are other changes in separate branches, and are you going to do a massive merge when the 3.5 version is stable, or am I missing something? Paul [/QUOTE]

Verification