Index: dbcheck.cpp =================================================================== --- dbcheck.cpp (revision 7535) +++ dbcheck.cpp (working copy) @@ -486,7 +486,7 @@ { if (!InitializeDatabase()) return false; - dbver = "1060"; + dbver = "1099"; } if (dbver == "900") @@ -2273,13 +2273,25 @@ " audioratelimit int(11) default NULL," " hostname varchar(255) default NULL," " dvb_swfilter int(11) default '0'," -" dvb_recordts int(11) default '1'," +" dvb_recordts int default '1'," " dvb_sat_type int(11) NOT NULL default '0'," " dvb_wait_for_seqstart int(11) NOT NULL default '1'," " dvb_dmx_buf_size int(11) NOT NULL default '8192'," " dvb_pkt_buf_size int(11) NOT NULL default '8192'," " skipbtaudio tinyint(1) default '0'," " dvb_on_demand tinyint(4) NOT NULL default '0'," +" dvb_diseqc_type SMALLINT(6)," +" firewire_port INT UNSIGNED NOT NULL DEFAULT 0," +" firewire_node INT UNSIGNED NOT NULL DEFAULT 2," +" firewire_speed INT UNSIGNED NOT NULL DEFAULT 0," +" firewire_model varchar(32) NULL," +" firewire_connection INT UNSIGNED NOT NULL DEFAULT 0," +" dvb_hw_decoder INT DEFAULT '0'," +" dbox2_port INT UNSIGNED NOT NULL DEFAULT 31338," +" dbox2_httpport INT UNSIGNED NOT NULL DEFAULT 80," +" dbox2_host varchar(32) NULL," +" signal_timeout int NOT NULL default '1000'," +" channel_timeout int NOT NULL default '3000'," " PRIMARY KEY (cardid)" ");", "CREATE TABLE IF NOT EXISTS cardinput (" @@ -2292,6 +2304,12 @@ " shareable char(1) default 'N'," " tunechan varchar(5) NOT NULL default ''," " startchan varchar(5) NOT NULL default ''," +" freetoaironly TINYINT(1) DEFAULT 1," +" diseqc_port SMALLINT(6)," +" diseqc_pos FLOAT," +" lnb_lof_switch INT(11) DEFAULT 11700000," +" lnb_lof_hi INT(11) DEFAULT 10600000," +" lnb_lof_lo INT(11) DEFAULT 9750000," " PRIMARY KEY (cardinputid)" ");", "CREATE TABLE IF NOT EXISTS channel (" @@ -2314,6 +2332,10 @@ " commfree tinyint(4) NOT NULL default '0'," " visible tinyint(1) NOT NULL default '1'," " outputfilters varchar(255) NOT NULL default ''," +" useonairguide TINYINT(1) DEFAULT 0," +" mplexid SMALLINT(6)," +" serviceid mediumint unsigned," +" atscsrcid INT(11) DEFAULT NULL," " PRIMARY KEY (chanid)," " KEY channel_src (channum,sourceid)" ");", @@ -2354,61 +2376,36 @@ " UNIQUE KEY chanid (chanid,starttime,person,role)," " KEY person (person,role)" ");", -"CREATE TABLE IF NOT EXISTS dvb_channel (" -" chanid smallint(6) NOT NULL default '0'," -" serviceid smallint(6) default NULL," -" networkid smallint(6) default NULL," -" providerid smallint(6) default NULL," -" transportid smallint(6) default NULL," +"CREATE TABLE IF NOT EXISTS dtv_multiplex (" +" mplexid smallint(6) NOT NULL auto_increment, " +" sourceid smallint(6) default NULL," +" transportid int(11) default NULL," +" networkid int(11) default NULL," " frequency int(11) default NULL," -" inversion char(1) default NULL," +" inversion char(1) default 'a'," " symbolrate int(11) default NULL," -" fec varchar(10) default NULL," +" fec varchar(10) default 'auto'," " polarity char(1) default NULL," -" satid smallint(6) default NULL," -" modulation varchar(10) default NULL," -" bandwidth char(1) default NULL," -" lp_code_rate varchar(10) default NULL," -" transmission_mode char(1) default NULL," -" guard_interval varchar(10) default NULL," -" hierarchy char(1) default NULL," -" pmtcache blob," -" PRIMARY KEY (chanid)" +" modulation varchar(10) default 'auto'," +" bandwidth char(1) default 'a'," +" lp_code_rate varchar(10) default 'auto'," +" transmission_mode char(1) default 'a'," +" guard_interval varchar(10) default 'auto'," +" visible smallint(1) NOT NULL default '0'," +" constellation varchar(10) default 'auto'," +" hierarchy varchar(10) default 'auto'," +" hp_code_rate varchar(10) default 'auto'," +" sistandard varchar(10) default 'dvb'," +" serviceversion smallint(6) default 33," +" updatetimestamp timestamp(14) NOT NULL," +" PRIMARY KEY (mplexid)" +") TYPE=MyISAM;", +"CREATE TABLE dtv_privatetypes (" +" sitype varchar(4) NOT NULL, " +" networkid int(11) NOT NULL, " +" private_type varchar(20) NOT NULL, " +" private_value varchar(100) NOT NULL " ");", -"CREATE TABLE IF NOT EXISTS dvb_pids (" -" chanid smallint(6) NOT NULL default '0'," -" pid smallint(6) NOT NULL default '0'," -" type char(1) NOT NULL default 'o'," -" lang char(3) NOT NULL default ''," -" PRIMARY KEY (chanid,pid)" -");", -"CREATE TABLE IF NOT EXISTS dvb_sat (" -" satid smallint(6) NOT NULL auto_increment," -" cardid int(11) default NULL," -" pos float default NULL," -" name varchar(128) default NULL," -" diseqc_type smallint(6) default '0'," -" diseqc_port smallint(6) default '0'," -" diseqc_pos smallint(6) default '0'," -" lnb_lof_switch int(11) default '11700000'," -" lnb_lof_hi int(11) default '10600000'," -" lnb_lof_lo int(11) default '9750000'," -" PRIMARY KEY (satid)" -");", -"CREATE TABLE IF NOT EXISTS dvb_signal_quality (" -" id int(10) unsigned NOT NULL auto_increment," -" sampletime timestamp(14) NOT NULL," -" cardid int(10) unsigned NOT NULL default '0'," -" fe_snr int(10) unsigned NOT NULL default '0'," -" fe_ss int(10) unsigned NOT NULL default '0'," -" fe_ber int(10) unsigned NOT NULL default '0'," -" fe_unc int(10) unsigned NOT NULL default '0'," -" myth_cont int(10) unsigned NOT NULL default '0'," -" myth_over int(10) unsigned NOT NULL default '0'," -" myth_pkts int(10) unsigned NOT NULL default '0'," -" PRIMARY KEY (id)," -" KEY sampletime (sampletime,cardid)" -");", "CREATE TABLE IF NOT EXISTS favorites (" " favid int(11) unsigned NOT NULL auto_increment," " userid int(11) unsigned NOT NULL default '0'," @@ -2474,6 +2471,11 @@ " PRIMARY KEY (id)," " UNIQUE KEY network (network)" ");", +"CREATE TABLE IF NOT EXISTS oldfind (" +" recordid INT NOT NULL DEFAULT 0," +" findid INT NOT NULL DEFAULT 0," +" PRIMARY KEY (recordid, findid)" +");", "CREATE TABLE IF NOT EXISTS oldprogram (" " oldtitle varchar(128) NOT NULL default ''," " airdate datetime NOT NULL default '0000-00-00 00:00:00'," @@ -2488,12 +2490,19 @@ " description text NOT NULL," " category varchar(64) NOT NULL default ''," " seriesid varchar(12) NOT NULL default ''," -" programid varchar(12) NOT NULL default ''," -" PRIMARY KEY (chanid,starttime)," +" programid varchar(20) NOT NULL default ''," +" recordid INT NOT NULL DEFAULT 0," +" station VARCHAR(20) NOT NULL DEFAULT ''," +" rectype INT(10) UNSIGNED NOT NULL DEFAULT 0," +" duplicate TINYINT(1) NOT NULL DEFAULT 0," +" recstatus INT NOT NULL DEFAULT 0," +" reactivate SMALLINT NOT NULL DEFAULT 0," +" PRIMARY KEY (station,starttime,title)," " KEY endtime (endtime)," " KEY title (title)," " KEY seriesid (seriesid)," -" KEY programid (programid)" +" KEY programid (programid)," +" KEY recordid (recordid)" ");", "CREATE TABLE IF NOT EXISTS people (" " person mediumint(8) unsigned NOT NULL auto_increment," @@ -2501,6 +2510,12 @@ " PRIMARY KEY (person)," " UNIQUE KEY name (name(41))" ");", +"CREATE TABLE IF NOT EXISTS pidcache (" +" chanid smallint(6) NOT NULL default '0'," +" pid int(11) NOT NULL default '-1'," +" tableid int(11) NOT NULL default '-1'," +" INDEX(chanid)" +");", "CREATE TABLE IF NOT EXISTS profilegroups (" " id int(10) unsigned NOT NULL auto_increment," " name varchar(128) default NULL," @@ -2523,19 +2538,20 @@ " stars float NOT NULL default '0'," " previouslyshown tinyint(4) NOT NULL default '0'," " title_pronounce varchar(128) NOT NULL default ''," -" stereo tinyint(1) default NULL," -" subtitled tinyint(1) default NULL," -" hdtv tinyint(1) default NULL," -" closecaptioned tinyint(1) default NULL," -" partnumber int(11) default NULL," -" parttotal int(11) default NULL," +" stereo tinyint(1) default '0' NOT NULL," +" subtitled tinyint(1) default '0' NOT NULL," +" hdtv tinyint(1) default '0' NOT NULL," +" closecaptioned tinyint(1) default '0' NOT NULL," +" partnumber int(11) default '0' NOT NULL," +" parttotal int(11) default '0' NOT NULL," " seriesid varchar(12) NOT NULL default ''," " originalairdate date default NULL," " showtype varchar(30) NOT NULL default ''," " colorcode varchar(20) NOT NULL default ''," " syndicatedepisodenumber varchar(20) NOT NULL default ''," -" programid varchar(12) NOT NULL default ''," -" PRIMARY KEY (chanid,starttime)," +" programid varchar(20) NOT NULL default ''," +" manualid INT UNSIGNED NOT NULL DEFAULT 0," +" PRIMARY KEY (chanid,starttime, manualid)," " KEY endtime (endtime)," " KEY title (title)," " KEY title_pronounce (title_pronounce)," @@ -2588,7 +2604,7 @@ " dupin int(11) NOT NULL default '15'," " station varchar(20) NOT NULL default ''," " seriesid varchar(12) NOT NULL default ''," -" programid varchar(12) NOT NULL default ''," +" programid varchar(20) NOT NULL default ''," " search int(10) unsigned NOT NULL default '0'," " autotranscode tinyint(1) NOT NULL default '0'," " autocommflag tinyint(1) NOT NULL default '0'," @@ -2596,6 +2612,10 @@ " autouserjob2 tinyint(1) NOT NULL default '0'," " autouserjob3 tinyint(1) NOT NULL default '0'," " autouserjob4 tinyint(1) NOT NULL default '0'," +" inactive TINYINT(1) NOT NULL DEFAULT 0," +" parentid INT NOT NULL DEFAULT 0," +" transcoder INT NOT NULL DEFAULT 0," +" tsdefault FLOAT NOT NULL DEFAULT 1.0," " PRIMARY KEY (recordid)," " KEY chanid (chanid,starttime)," " KEY title (title)," @@ -2619,18 +2639,35 @@ " recgroup varchar(32) NOT NULL default 'Default'," " recordid int(11) default NULL," " seriesid varchar(12) NOT NULL default ''," -" programid varchar(12) NOT NULL default ''," +" programid varchar(20) NOT NULL default ''," " lastmodified timestamp(14) NOT NULL," " filesize bigint(20) NOT NULL default '0'," " stars float NOT NULL default '0'," " previouslyshown tinyint(1) default '0'," " originalairdate date default NULL," " preserve tinyint(1) NOT NULL default '0'," +" deletepending TINYINT(1) NOT NULL DEFAULT 0," +" transcoder INT NOT NULL DEFAULT 0," +" timestretch FLOAT NOT NULL DEFAULT 1.0," +" recpriority INT NOT NULL DEFAULT 0," +" basename varchar(128) NOT NULL DEFAULT ''," +" progstart DATETIME NOT NULL," +" progend DATETIME NOT NULL," " PRIMARY KEY (chanid,starttime)," " KEY endtime (endtime)," " KEY seriesid (seriesid)," -" KEY programid (programid)" +" KEY programid (programid)," +" KEY title (title)" +" KEY recordid (recordid)" ");", +"CREATE TABLE IF NOT EXISTS recordedcredits (" +" person mediumint(8) unsigned NOT NULL default '0'," +" chanid int(10) unsigned NOT NULL default '0'," +" starttime datetime NOT NULL default '0000-00-00 00:00:00'," +" role set('actor','director','producer','executive_producer','writer','guest_star','host','adapter','presenter','commentator','guest') NOT NULL default ''," +" UNIQUE KEY chanid (chanid,starttime,person,role)," +" KEY person (person,role)" +");", "CREATE TABLE IF NOT EXISTS recordedmarkup (" " chanid int(10) unsigned NOT NULL default '0'," " starttime datetime NOT NULL default '0000-00-00 00:00:00'," @@ -2639,6 +2676,40 @@ " type int(11) NOT NULL default '0'," " PRIMARY KEY (chanid,starttime,mark,type)" ");", +"CREATE TABLE IF NOT EXISTS recordedprogram (" +" chanid int(10) unsigned NOT NULL default '0'," +" starttime datetime NOT NULL default '0000-00-00 00:00:00'," +" endtime datetime NOT NULL default '0000-00-00 00:00:00'," +" title varchar(128) NOT NULL default ''," +" subtitle varchar(128) NOT NULL default ''," +" description text NOT NULL," +" category varchar(64) NOT NULL default ''," +" category_type varchar(64) NOT NULL default ''," +" airdate year(4) NOT NULL default '0000'," +" stars float unsigned NOT NULL default '0'," +" previouslyshown tinyint(4) NOT NULL default '0'," +" title_pronounce varchar(128) NOT NULL default ''," +" stereo tinyint(1) NOT NULL default '0'," +" subtitled tinyint(1) NOT NULL default '0'," +" hdtv tinyint(1) NOT NULL default '0'," +" closecaptioned tinyint(1) NOT NULL default '0'," +" partnumber int(11) NOT NULL default '0'," +" parttotal int(11) NOT NULL default '0'," +" seriesid varchar(12) NOT NULL default ''," +" originalairdate date default NULL," +" showtype varchar(30) NOT NULL default ''," +" colorcode varchar(20) NOT NULL default ''," +" syndicatedepisodenumber varchar(20) NOT NULL default ''," +" programid varchar(20) NOT NULL default ''," +" manualid int(10) unsigned NOT NULL default '0'," +" PRIMARY KEY (chanid,starttime,manualid)," +" KEY endtime (endtime)," +" KEY title (title)," +" KEY title_pronounce (title_pronounce)," +" KEY seriesid (seriesid)," +" KEY programid (programid)," +" KEY id_start_end (chanid,starttime,endtime)" +");", "CREATE TABLE IF NOT EXISTS recordingprofiles (" " id int(10) unsigned NOT NULL auto_increment," " name varchar(128) default NULL," @@ -2647,6 +2718,21 @@ " profilegroup int(10) unsigned NOT NULL default '0'," " PRIMARY KEY (id)" ");", +"CREATE TABLE IF NOT EXISTS recordedrating (" +" chanid int(10) unsigned NOT NULL default '0'," +" starttime datetime NOT NULL default '0000-00-00 00:00:00'," +" system char(8) NOT NULL default ''," +" rating char(8) NOT NULL default ''," +" UNIQUE KEY chanid (chanid,starttime,system,rating)," +" KEY starttime (starttime,system)" +");", +"CREATE TABLE IF NOT EXISTS recordmatch (" +" recordid int unsigned," +" chanid int unsigned," +" starttime datetime," +" manualid INT UNSIGNED," +" INDEX (recordid)" +");", "CREATE TABLE IF NOT EXISTS recordoverride (" " recordid int(10) unsigned NOT NULL default '0'," " type int(10) unsigned NOT NULL default '0'," @@ -2664,6 +2750,11 @@ " hostname varchar(255) default NULL," " KEY value (value,hostname)" ");", +"CREATE TABLE IF NOT EXISTS videobookmarks (" +" filename varchar(255) NOT NULL," +" bookmark varchar(128) default NULL," +" PRIMARY KEY (filename)" +");", "CREATE TABLE IF NOT EXISTS videosource (" " sourceid int(10) unsigned NOT NULL auto_increment," " name varchar(128) NOT NULL default ''," @@ -2675,12 +2766,85 @@ " PRIMARY KEY (sourceid)," " UNIQUE KEY name (name)" ");", +"CREATE TABLE IF NOT EXISTS xvmc_buffer_settings ( " +" id int(11) NOT NULL auto_increment, " +" description varchar(255) NOT NULL default ''," +" osd_num int(11) NOT NULL default '0'," +" osd_res_num int(11) NOT NULL default '0'," +" min_surf int(11) NOT NULL default '0'," +" max_surf int(11) NOT NULL default '0'," +" decode_num int(11) NOT NULL default '0'," +" agressive int(11) NOT NULL default '1'," +" PRIMARY KEY (id) );", + +//# UK DVB-T +"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',9018,'channel_numbers','131');", +"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',9018,'guide_fixup','2');", +//# Bell ExpressVu Canada +"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',256,'guide_fixup','1');", +"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',257,'guide_fixup','1');", +"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',256,'tv_types','1,150,134,133');", +"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',257,'tv_types','1,150,134,133');", + +"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4100,'sdt_mapping','1');", +"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4101,'sdt_mapping','1');", +"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4102,'sdt_mapping','1');", +"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4103,'sdt_mapping','1');", +"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4104,'sdt_mapping','1');", +"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4105,'sdt_mapping','1');", +"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4106,'sdt_mapping','1');", +"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4107,'sdt_mapping','1');", +"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4097,'sdt_mapping','1');", +"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4098,'sdt_mapping','1');", + +"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4100,'tv_types','1,145,154');", +"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4101,'tv_types','1,145,154');", +"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4102,'tv_types','1,145,154');", +"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4103,'tv_types','1,145,154');", +"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4104,'tv_types','1,145,154');", +"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4105,'tv_types','1,145,154');", +"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4106,'tv_types','1,145,154');", +"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4107,'tv_types','1,145,154');", +"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4097,'tv_types','1,145,154');", +"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4098,'tv_types','1,145,154');", + +"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4100,'guide_fixup','1');", +"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4101,'guide_fixup','1');", +"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4102,'guide_fixup','1');", +"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4103,'guide_fixup','1');", +"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4104,'guide_fixup','1');", +"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4105,'guide_fixup','1');", +"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4106,'guide_fixup','1');", +"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4107,'guide_fixup','1');", +"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4097,'guide_fixup','1');", +"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4098,'guide_fixup','1');", +"INSERT INTO dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES('dvb', '40999', 'guide_fixup', '4');", + +//# NSAB / Sirius +"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',94,'tv_types','1,128');", +//# WUNC Guide +"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('atsc',1793,'guide_fixup','3');", + +"INSERT INTO dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',70,'force_guide_present','yes');", +"INSERT INTO dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',70,'guide_ranges','80,80,96,96');", +"INSERT INTO dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4112,'channel_numbers','131');", +"INSERT INTO dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4115,'channel_numbers','131');", +"INSERT INTO dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4116,'channel_numbers','131');", +"INSERT INTO dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',12802,'channel_numbers','131');", +"INSERT INTO dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',12803,'channel_numbers','131');", +"INSERT INTO dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',12829,'channel_numbers','131');", + +"INSERT INTO dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',40999,'parse_subtitle_list','1070,1308,1041,1306,1307,1030,1016,1131,1068,1069');", + "INSERT INTO profilegroups SET name = 'Software Encoders (v4l based)', cardtype = 'V4L', is_default = 1;", "INSERT INTO profilegroups SET name = 'MPEG-2 Encoders (PVR-x50, PVR-500)', cardtype = 'MPEG', is_default = 1;", "INSERT INTO profilegroups SET name = 'Hardware MJPEG Encoders (Matrox G200-TV, Miro DC10, etc)', cardtype = 'MJPEG', is_default = 1;", "INSERT INTO profilegroups SET name = 'Hardware HDTV', cardtype = 'HDTV', is_default = 1;", "INSERT INTO profilegroups SET name = 'Hardware DVB Encoders', cardtype = 'DVB', is_default = 1;", "INSERT INTO profilegroups SET name = 'Transcoders', cardtype = 'TRANSCODE', is_default = 1;", +"INSERT INTO profilegroups SET name = 'FireWire Input', cardtype = 'FIREWIRE', is_default = 1;", +"INSERT INTO profilegroups SET name = 'USB Mpeg-4 Encoder (Plextor ConvertX, etc)', cardtype = 'GO7007', is_default = 1;", +"INSERT INTO profilegroups SET name = 'DBOX2 Input', cardtype = 'DBOX2', is_default = 1;", "INSERT INTO recordingprofiles SET name = 'Default', profilegroup = 1;", "INSERT INTO recordingprofiles SET name = 'Live TV', profilegroup = 1;", "INSERT INTO recordingprofiles SET name = 'High Quality', profilegroup = 1;", @@ -2703,17 +2867,29 @@ "INSERT INTO recordingprofiles SET name = 'Low Quality', profilegroup = 5;", "INSERT INTO recordingprofiles SET name = 'RTjpeg/MPEG4', profilegroup = 6;", "INSERT INTO recordingprofiles SET name = 'MPEG2', profilegroup = 6;", +"INSERT INTO recordingprofiles SET name = 'High Quality', profilegroup = 6;", +"INSERT INTO recordingprofiles SET name = 'Medium Quality', profilegroup = 6;", +"INSERT INTO recordingprofiles SET name = 'Low Quality', profilegroup = 6;", +"INSERT INTO recordingprofiles SET name = 'Default', profilegroup = 8;", +"INSERT INTO recordingprofiles SET name = 'Live TV', profilegroup = 8;", +"INSERT INTO recordingprofiles SET name = 'High Quality', profilegroup = 8;", +"INSERT INTO recordingprofiles SET name = 'Low Quality', profilegroup = 8;", + "INSERT INTO settings SET value='mythfilldatabaseLastRunStart';", "INSERT INTO settings SET value='mythfilldatabaseLastRunEnd';", "INSERT INTO settings SET value='mythfilldatabaseLastRunStatus';", "INSERT INTO settings SET value='DataDirectMessage';", "INSERT INTO settings SET value='HaveRepeats', data='0';", -"INSERT INTO settings SET value='DBSchemaVer', data='1060';", +"INSERT INTO settings SET value='DBSchemaVer', data='1099';", +"INSERT INTO settings SET value = 'DefaultTranscoder', data = '0';", + +"INSERT INTO xvmc_buffer_settings VALUES (1,'Default / nVidia',2,2,8,16,8,1);", +"INSERT INTO xvmc_buffer_settings VALUES (2,'VLD (More decode buffers)',2,2,8,16,16,1);", "" }; QString dbver = ""; - if (!performActualUpdate(updates, "1060", dbver)) + if (!performActualUpdate(updates, "1099", dbver)) return false; return true; }