Index: ProgramInfo.cpp
===================================================================
RCS file: /cvsroot/dsmyth/MythTVReader/MythSource/ProgramInfo.cpp,v
retrieving revision 1.3
diff -u -r1.3 ProgramInfo.cpp
--- ProgramInfo.cpp	25 Jan 2004 12:57:20 -0000	1.3
+++ ProgramInfo.cpp	2 Mar 2004 16:53:42 -0000
@@ -40,18 +40,24 @@
 #include "util.h"
 
 CProgramInfo::CProgramInfo(void)
-:m_conflicting(false),
-m_recording(false),
-m_override(0),
+:m_override(0),
 m_filesize(0),
 m_recstatus(rsUnknown),
 m_recordid(0),
 m_rectype(kNotRecording),
-m_recdups(kRecordDupsNever),
-m_sourceid(-1),
-m_inputid(-1),
-m_cardid(-1),
-m_repeat(false)
+m_dupin(kDupsInAll),
+m_dupmethod(kDupCheckSubDesc),
+m_sourceid(0),
+m_inputid(0),
+m_cardid(0),
+m_repeat(false),
+m_recpriority(0),
+m_chancommfree(0),
+m_numconflicts(0),
+m_conflictpriority(-1000),
+m_savedrecstatus(rsUnknown),
+m_recgroup("Default"),
+m_sharable(false)
 {
 
 }
@@ -83,27 +89,35 @@
 	m_filesize=DecodeLongLong(list[offset+9],list[offset+10]);
 	m_startts=list[offset+11];
 	m_endts=list[offset+12];
-	m_conflicting=atoi(list[offset+13])!=0;
-	m_recording=atoi(list[offset+14])!=0;
+	//m_conflicting=atoi(list[offset+13])!=0;
+	m_sharable=atoi(list[offset+14])!=0;
 	m_override=atoi(list[offset+15]);
 	m_hostname=list[offset+16].Trim();
 	m_sourceid=atoi(list[offset+17]);
 	m_cardid=atoi(list[offset+18]);
 	m_inputid=atoi(list[offset+19]);
-	m_recpriority=list[offset+20].Trim();
+	m_recpriority=atoi(list[offset+20]);
 	m_recstatus=RecStatusType(atoi(list[offset+21]));
 	m_recordid=atoi(list[offset+22]);
 	m_rectype=RecordingType(atoi(list[offset+23]));
-	m_recdups=RecordingDupsType(atoi(list[offset+24]));
-	m_recstartts=list[offset+25];
-	m_recendts=list[offset+26];
-	m_repeat=atoi(list[offset+27])!=0;
-	m_programflags=atoi(list[offset+28]);
+	m_dupin=RecordingDupInType(atoi(list[offset+24]));
+	m_dupmethod=RecordingDupMethodType(atoi(list[offset+25]));
+	m_recstartts=list[offset+26];
+	m_recendts=list[offset+27];
+	m_repeat=atoi(list[offset+28])!=0;
+	m_programflags=atoi(list[offset+29]);
+	m_recgroup=list[offset+30].Trim();
+	m_chancommfree=atoi(list[offset+31]);
+	
+	if(m_recgroup="")
+	{
+		m_recgroup="Default";
+	}
 }
 
 void CProgramInfo::ToString(CAtlString &str)
 {
-	str.Format("%s[]:[]%s[]:[]%s[]:[]%s[]:[]%s[]:[]%s[]:[]%s[]:[]%s[]:[]%s[]:[]%ld[]:[]%ld[]:[]%s[]:[]%s[]:[]%d[]:[]%d[]:[]%d[]:[]%s[]:[]%d[]:[]%d[]:[]%d[]:[]%s[]:[]%d[]:[]%u[]:[]%d[]:[]%d[]:[]%s[]:[]%s[]:[]%d[]:[]%d",
+	str.Format("%s[]:[]%s[]:[]%s[]:[]%s[]:[]%s[]:[]%s[]:[]%s[]:[]%s[]:[]%s[]:[]%ld[]:[]%ld[]:[]%s[]:[]%s[]:[]%s[]:[]%d[]:[]%d[]:[]%s[]:[]%d[]:[]%d[]:[]%d[]:[]%d[]:[]%d[]:[]%u[]:[]%d[]:[]%d[]:[]%d[]:[]%s[]:[]%s[]:[]%d[]:[]%d[]:[]%s[]:[]%d",
 		m_title!="" ? m_title.GetBuffer() : " ",
 		m_subtitle!="" ? m_subtitle.GetBuffer() : " ",
 		m_description!="" ? m_description.GetBuffer() : " ",
@@ -117,20 +131,24 @@
 		(long)m_filesize&0xffffffff,
 		m_startts,
 		m_endts,
-		(int)m_conflicting,
-		(int)m_recording,
+		" ",
+		(int)m_sharable,
 		m_override,
 		m_hostname!="" ? m_hostname.GetBuffer() : " ",
 		m_sourceid,
 		m_cardid,
 		m_inputid,
-		m_recpriority!="" ? m_recpriority.GetBuffer() : " ",
+		m_recpriority,
 		(int)m_recstatus,
 		m_recordid,
 		(int)m_rectype,
-		(int)m_recdups,
+		(int)m_dupin,
+		(int)m_dupmethod,
 		m_recstartts.GetBuffer(),
 		m_recendts.GetBuffer(),
 		(int)m_repeat,
-		(int)m_programflags);
+		(int)m_programflags,
+		m_recgroup!="" ? m_recgroup.GetBuffer() : "Default",
+		m_chancommfree
+		);
 }
Index: ProgramInfo.h
===================================================================
RCS file: /cvsroot/dsmyth/MythTVReader/MythSource/ProgramInfo.h,v
retrieving revision 1.3
diff -u -r1.3 ProgramInfo.h
--- ProgramInfo.h	25 Jan 2004 12:57:24 -0000	1.3
+++ ProgramInfo.h	2 Mar 2004 16:53:42 -0000
@@ -37,7 +37,7 @@
 
 #pragma once
 
-#define NUMPROGRAMLINES 29
+#define NUMPROGRAMLINES 31
 enum RecordingType
 {
 	kNotRecording = 0,
@@ -66,17 +66,33 @@
 	rsManualOverride = 1,
 	rsPreviousRecording = 2,
 	rsCurrentRecording = 3,
-	rsOtherShowing = 4,
+	rsEarlierShowing = 4,
 	rsTooManyRecordings = 5,
 	rsCancelled = 6,
-	rsLowerRecPriority = 7,
-	rsManualConflict = 8,
-	rsAutoConflict = 9,
+	rsConflict = 7,
+	rsLaterShowing = 8,
+	//rsUnused = 9,
 	rsOverlap = 10,
 	rsLowDiskSpace = 11,
 	rsTunerBusy = 12
 };
 
+enum RecordingDupInType
+{
+	kDupsInRecorded = 0x01,
+	kDupsInOldRecorded = 0x02,
+	kDupsInAll = 0x0F
+};
+
+
+enum RecordingDupMethodType
+{
+	kDupCheckNone = 0x01,
+	kDupCheckSub = 0x02,
+	kDupCheckDesc = 0x04,
+	kDupCheckSubDesc = 0x06
+};
+
 /**
  *
  */
@@ -100,7 +116,9 @@
 	CAtlString m_chanstr;
 	CAtlString m_chansign;
 	CAtlString m_channame;
-	CAtlString m_recpriority;
+	int m_recpriority;
+	CAtlString m_recgroup;
+	int m_chancommfree;
 
 	CAtlString m_pathname;
 	LONGLONG m_filesize;
@@ -112,18 +130,21 @@
 	CAtlString m_recendts;
 
 	bool m_repeat;
-
-	bool m_conflicting;
-	bool m_recording;
+	
 	int m_override;
 	RecStatusType m_recstatus;
-	unsigned int m_recordid;
+	RecStatusType m_savedrecstatus;
+	int m_numconflicts;
+	int m_conflictpriority;
+	int m_recordid;
 	RecordingType m_rectype;
-	RecordingDupsType m_recdups;
+	RecordingDupInType m_dupin;
+	RecordingDupMethodType m_dupmethod;
 
 	int m_sourceid;
 	int m_inputid;
 	int m_cardid;
+	bool m_sharable;
 
 	int m_programflags;
 };
Index: util.h
===================================================================
RCS file: /cvsroot/dsmyth/MythTVReader/MythSource/util.h,v
retrieving revision 1.4
diff -u -r1.4 util.h
--- util.h	17 Feb 2004 22:11:12 -0000	1.4
+++ util.h	2 Mar 2004 16:53:42 -0000
@@ -40,7 +40,7 @@
  */
 #include "Socket.h"
 
-#define MYTH_PROTO_VERSION 1
+#define MYTH_PROTO_VERSION 4
 
 void SplitString(CAtlString str,CAtlArray<CAtlString> &list);
 bool SendCommand(CSocket &sock,CAtlString &cmd,CAtlString &Response);