Ticket #504: dbcheck.patch

File dbcheck.patch, 23.5 KB (added by Samuel@…, 15 years ago)
  • dbcheck.cpp

     
    486486    {
    487487        if (!InitializeDatabase())
    488488            return false;
    489         dbver = "1060";
     489        dbver = "1099";
    490490    }
    491491
    492492    if (dbver == "900")
     
    22732273"  audioratelimit int(11) default NULL,"
    22742274"  hostname varchar(255) default NULL,"
    22752275"  dvb_swfilter int(11) default '0',"
    2276 "  dvb_recordts int(11) default '1',"
     2276"  dvb_recordts int default '1',"
    22772277"  dvb_sat_type int(11) NOT NULL default '0',"
    22782278"  dvb_wait_for_seqstart int(11) NOT NULL default '1',"
    22792279"  dvb_dmx_buf_size int(11) NOT NULL default '8192',"
    22802280"  dvb_pkt_buf_size int(11) NOT NULL default '8192',"
    22812281"  skipbtaudio tinyint(1) default '0',"
    22822282"  dvb_on_demand tinyint(4) NOT NULL default '0',"
     2283"  dvb_diseqc_type SMALLINT(6),"
     2284"  firewire_port INT UNSIGNED NOT NULL DEFAULT 0,"
     2285"  firewire_node INT UNSIGNED NOT NULL DEFAULT 2,"
     2286"  firewire_speed INT UNSIGNED NOT NULL DEFAULT 0,"
     2287"  firewire_model varchar(32) NULL,"
     2288"  firewire_connection INT UNSIGNED NOT NULL DEFAULT 0,"
     2289"  dvb_hw_decoder INT DEFAULT '0',"
     2290"  dbox2_port INT UNSIGNED NOT NULL DEFAULT 31338,"
     2291"  dbox2_httpport INT UNSIGNED NOT NULL DEFAULT 80,"
     2292"  dbox2_host varchar(32) NULL,"
     2293"  signal_timeout int NOT NULL default '1000',"
     2294"  channel_timeout int NOT NULL default '3000',"
    22832295"  PRIMARY KEY  (cardid)"
    22842296");",
    22852297"CREATE TABLE IF NOT EXISTS cardinput ("
     
    22922304"  shareable char(1) default 'N',"
    22932305"  tunechan varchar(5) NOT NULL default '',"
    22942306"  startchan varchar(5) NOT NULL default '',"
     2307"  freetoaironly TINYINT(1) DEFAULT 1,"
     2308"  diseqc_port SMALLINT(6),"
     2309"  diseqc_pos FLOAT,"
     2310"  lnb_lof_switch INT(11) DEFAULT 11700000,"
     2311"  lnb_lof_hi INT(11) DEFAULT 10600000,"
     2312"  lnb_lof_lo INT(11) DEFAULT 9750000,"
    22952313"  PRIMARY KEY  (cardinputid)"
    22962314");",
    22972315"CREATE TABLE IF NOT EXISTS channel ("
     
    23142332"  commfree tinyint(4) NOT NULL default '0',"
    23152333"  visible tinyint(1) NOT NULL default '1',"
    23162334"  outputfilters varchar(255) NOT NULL default '',"
     2335"  useonairguide TINYINT(1) DEFAULT 0,"
     2336"  mplexid SMALLINT(6),"
     2337"  serviceid mediumint unsigned,"
     2338"  atscsrcid INT(11) DEFAULT NULL,"
    23172339"  PRIMARY KEY  (chanid),"
    23182340"  KEY channel_src (channum,sourceid)"
    23192341");",
     
    23542376"  UNIQUE KEY chanid (chanid,starttime,person,role),"
    23552377"  KEY person (person,role)"
    23562378");",
    2357 "CREATE TABLE IF NOT EXISTS dvb_channel ("
    2358 "  chanid smallint(6) NOT NULL default '0',"
    2359 "  serviceid smallint(6) default NULL,"
    2360 "  networkid smallint(6) default NULL,"
    2361 "  providerid smallint(6) default NULL,"
    2362 "  transportid smallint(6) default NULL,"
     2379"CREATE TABLE IF NOT EXISTS dtv_multiplex ("
     2380"  mplexid smallint(6) NOT NULL auto_increment, "
     2381"  sourceid smallint(6) default NULL,"
     2382"  transportid int(11) default NULL,"
     2383"  networkid int(11) default NULL,"
    23632384"  frequency int(11) default NULL,"
    2364 "  inversion char(1) default NULL,"
     2385"  inversion char(1) default 'a',"
    23652386"  symbolrate int(11) default NULL,"
    2366 "  fec varchar(10) default NULL,"
     2387"  fec varchar(10) default 'auto',"
    23672388"  polarity char(1) default NULL,"
    2368 "  satid smallint(6) default NULL,"
    2369 "  modulation varchar(10) default NULL,"
    2370 "  bandwidth char(1) default NULL,"
    2371 "  lp_code_rate varchar(10) default NULL,"
    2372 "  transmission_mode char(1) default NULL,"
    2373 "  guard_interval varchar(10) default NULL,"
    2374 "  hierarchy char(1) default NULL,"
    2375 "  pmtcache blob,"
    2376 "  PRIMARY KEY  (chanid)"
     2389"  modulation varchar(10) default 'auto',"
     2390"  bandwidth char(1) default 'a',"
     2391"  lp_code_rate varchar(10) default 'auto',"
     2392"  transmission_mode char(1) default 'a',"
     2393"  guard_interval varchar(10) default 'auto',"
     2394"  visible smallint(1) NOT NULL default '0',"
     2395"  constellation varchar(10) default 'auto',"
     2396"  hierarchy varchar(10) default 'auto',"
     2397"  hp_code_rate varchar(10) default 'auto',"
     2398"  sistandard varchar(10) default 'dvb',"
     2399"  serviceversion smallint(6) default 33,"
     2400"  updatetimestamp timestamp(14) NOT NULL,"
     2401"  PRIMARY KEY  (mplexid)"
     2402") TYPE=MyISAM;",
     2403"CREATE TABLE dtv_privatetypes ("
     2404"  sitype varchar(4) NOT NULL, "
     2405"  networkid int(11) NOT NULL, "
     2406"  private_type varchar(20) NOT NULL, "
     2407"  private_value varchar(100) NOT NULL "
    23772408");",
    2378 "CREATE TABLE IF NOT EXISTS dvb_pids ("
    2379 "  chanid smallint(6) NOT NULL default '0',"
    2380 "  pid smallint(6) NOT NULL default '0',"
    2381 "  type char(1) NOT NULL default 'o',"
    2382 "  lang char(3) NOT NULL default '',"
    2383 "  PRIMARY KEY  (chanid,pid)"
    2384 ");",
    2385 "CREATE TABLE IF NOT EXISTS dvb_sat ("
    2386 "  satid smallint(6) NOT NULL auto_increment,"
    2387 "  cardid int(11) default NULL,"
    2388 "  pos float default NULL,"
    2389 "  name varchar(128) default NULL,"
    2390 "  diseqc_type smallint(6) default '0',"
    2391 "  diseqc_port smallint(6) default '0',"
    2392 "  diseqc_pos smallint(6) default '0',"
    2393 "  lnb_lof_switch int(11) default '11700000',"
    2394 "  lnb_lof_hi int(11) default '10600000',"
    2395 "  lnb_lof_lo int(11) default '9750000',"
    2396 "  PRIMARY KEY  (satid)"
    2397 ");",
    2398 "CREATE TABLE IF NOT EXISTS dvb_signal_quality ("
    2399 "  id int(10) unsigned NOT NULL auto_increment,"
    2400 "  sampletime timestamp(14) NOT NULL,"
    2401 "  cardid int(10) unsigned NOT NULL default '0',"
    2402 "  fe_snr int(10) unsigned NOT NULL default '0',"
    2403 "  fe_ss int(10) unsigned NOT NULL default '0',"
    2404 "  fe_ber int(10) unsigned NOT NULL default '0',"
    2405 "  fe_unc int(10) unsigned NOT NULL default '0',"
    2406 "  myth_cont int(10) unsigned NOT NULL default '0',"
    2407 "  myth_over int(10) unsigned NOT NULL default '0',"
    2408 "  myth_pkts int(10) unsigned NOT NULL default '0',"
    2409 "  PRIMARY KEY  (id),"
    2410 "  KEY sampletime (sampletime,cardid)"
    2411 ");",
    24122409"CREATE TABLE IF NOT EXISTS favorites ("
    24132410"  favid int(11) unsigned NOT NULL auto_increment,"
    24142411"  userid int(11) unsigned NOT NULL default '0',"
     
    24742471"  PRIMARY KEY  (id),"
    24752472"  UNIQUE KEY network (network)"
    24762473");",
     2474"CREATE TABLE IF NOT EXISTS oldfind ("
     2475"  recordid INT NOT NULL DEFAULT 0,"
     2476"  findid INT NOT NULL DEFAULT 0,"
     2477"  PRIMARY KEY (recordid, findid)"
     2478");",
    24772479"CREATE TABLE IF NOT EXISTS oldprogram ("
    24782480"  oldtitle varchar(128) NOT NULL default '',"
    24792481"  airdate datetime NOT NULL default '0000-00-00 00:00:00',"
     
    24882490"  description text NOT NULL,"
    24892491"  category varchar(64) NOT NULL default '',"
    24902492"  seriesid varchar(12) NOT NULL default '',"
    2491 "  programid varchar(12) NOT NULL default '',"
    2492 "  PRIMARY KEY  (chanid,starttime),"
     2493"  programid varchar(20) NOT NULL default '',"
     2494"  recordid INT NOT NULL DEFAULT 0,"
     2495"  station VARCHAR(20) NOT NULL DEFAULT '',"
     2496"  rectype INT(10) UNSIGNED NOT NULL DEFAULT 0,"
     2497"  duplicate TINYINT(1) NOT NULL DEFAULT 0,"
     2498"  recstatus INT NOT NULL DEFAULT 0,"
     2499"  reactivate SMALLINT NOT NULL DEFAULT 0,"
     2500"  PRIMARY KEY  (station,starttime,title),"
    24932501"  KEY endtime (endtime),"
    24942502"  KEY title (title),"
    24952503"  KEY seriesid (seriesid),"
    2496 "  KEY programid (programid)"
     2504"  KEY programid (programid),"
     2505"  KEY recordid (recordid)"
    24972506");",
    24982507"CREATE TABLE IF NOT EXISTS people ("
    24992508"  person mediumint(8) unsigned NOT NULL auto_increment,"
     
    25012510"  PRIMARY KEY  (person),"
    25022511"  UNIQUE KEY name (name(41))"
    25032512");",
     2513"CREATE TABLE IF NOT EXISTS pidcache ("
     2514"  chanid smallint(6) NOT NULL default '0',"
     2515"  pid int(11) NOT NULL default '-1',"
     2516"  tableid int(11) NOT NULL default '-1',"
     2517"  INDEX(chanid)"
     2518");",
    25042519"CREATE TABLE IF NOT EXISTS profilegroups ("
    25052520"  id int(10) unsigned NOT NULL auto_increment,"
    25062521"  name varchar(128) default NULL,"
     
    25232538"  stars float NOT NULL default '0',"
    25242539"  previouslyshown tinyint(4) NOT NULL default '0',"
    25252540"  title_pronounce varchar(128) NOT NULL default '',"
    2526 "  stereo tinyint(1) default NULL,"
    2527 "  subtitled tinyint(1) default NULL,"
    2528 "  hdtv tinyint(1) default NULL,"
    2529 "  closecaptioned tinyint(1) default NULL,"
    2530 "  partnumber int(11) default NULL,"
    2531 "  parttotal int(11) default NULL,"
     2541"  stereo tinyint(1) default '0' NOT NULL,"
     2542"  subtitled tinyint(1) default '0' NOT NULL,"
     2543"  hdtv tinyint(1) default '0' NOT NULL,"
     2544"  closecaptioned tinyint(1) default '0' NOT NULL,"
     2545"  partnumber int(11) default '0' NOT NULL,"
     2546"  parttotal int(11) default '0' NOT NULL,"
    25322547"  seriesid varchar(12) NOT NULL default '',"
    25332548"  originalairdate date default NULL,"
    25342549"  showtype varchar(30) NOT NULL default '',"
    25352550"  colorcode varchar(20) NOT NULL default '',"
    25362551"  syndicatedepisodenumber varchar(20) NOT NULL default '',"
    2537 "  programid varchar(12) NOT NULL default '',"
    2538 "  PRIMARY KEY  (chanid,starttime),"
     2552"  programid varchar(20) NOT NULL default '',"
     2553"  manualid INT UNSIGNED NOT NULL DEFAULT 0,"
     2554"  PRIMARY KEY  (chanid,starttime, manualid),"
    25392555"  KEY endtime (endtime),"
    25402556"  KEY title (title),"
    25412557"  KEY title_pronounce (title_pronounce),"
     
    25882604"  dupin int(11) NOT NULL default '15',"
    25892605"  station varchar(20) NOT NULL default '',"
    25902606"  seriesid varchar(12) NOT NULL default '',"
    2591 "  programid varchar(12) NOT NULL default '',"
     2607"  programid varchar(20) NOT NULL default '',"
    25922608"  search int(10) unsigned NOT NULL default '0',"
    25932609"  autotranscode tinyint(1) NOT NULL default '0',"
    25942610"  autocommflag tinyint(1) NOT NULL default '0',"
     
    25962612"  autouserjob2 tinyint(1) NOT NULL default '0',"
    25972613"  autouserjob3 tinyint(1) NOT NULL default '0',"
    25982614"  autouserjob4 tinyint(1) NOT NULL default '0',"
     2615"  inactive TINYINT(1) NOT NULL DEFAULT 0,"
     2616"  parentid INT NOT NULL DEFAULT 0,"
     2617"  transcoder INT NOT NULL DEFAULT 0,"
     2618"  tsdefault FLOAT NOT NULL DEFAULT 1.0,"
    25992619"  PRIMARY KEY  (recordid),"
    26002620"  KEY chanid (chanid,starttime),"
    26012621"  KEY title (title),"
     
    26192639"  recgroup varchar(32) NOT NULL default 'Default',"
    26202640"  recordid int(11) default NULL,"
    26212641"  seriesid varchar(12) NOT NULL default '',"
    2622 "  programid varchar(12) NOT NULL default '',"
     2642"  programid varchar(20) NOT NULL default '',"
    26232643"  lastmodified timestamp(14) NOT NULL,"
    26242644"  filesize bigint(20) NOT NULL default '0',"
    26252645"  stars float NOT NULL default '0',"
    26262646"  previouslyshown tinyint(1) default '0',"
    26272647"  originalairdate date default NULL,"
    26282648"  preserve tinyint(1) NOT NULL default '0',"
     2649"  deletepending TINYINT(1) NOT NULL DEFAULT 0,"
     2650"  transcoder INT NOT NULL DEFAULT 0,"
     2651"  timestretch FLOAT NOT NULL DEFAULT 1.0,"
     2652"  recpriority INT NOT NULL DEFAULT 0,"
     2653"  basename varchar(128) NOT NULL DEFAULT '',"
     2654"  progstart DATETIME NOT NULL,"
     2655"  progend DATETIME NOT NULL,"
    26292656"  PRIMARY KEY  (chanid,starttime),"
    26302657"  KEY endtime (endtime),"
    26312658"  KEY seriesid (seriesid),"
    2632 "  KEY programid (programid)"
     2659"  KEY programid (programid),"
     2660"  KEY title (title)"
     2661"  KEY recordid (recordid)"
    26332662");",
     2663"CREATE TABLE IF NOT EXISTS recordedcredits ("
     2664"  person mediumint(8) unsigned NOT NULL default '0',"
     2665"  chanid int(10) unsigned NOT NULL default '0',"
     2666"  starttime datetime NOT NULL default '0000-00-00 00:00:00',"
     2667"  role set('actor','director','producer','executive_producer','writer','guest_star','host','adapter','presenter','commentator','guest') NOT NULL default '',"
     2668"  UNIQUE KEY chanid (chanid,starttime,person,role),"
     2669"  KEY person (person,role)"
     2670");",
    26342671"CREATE TABLE IF NOT EXISTS recordedmarkup ("
    26352672"  chanid int(10) unsigned NOT NULL default '0',"
    26362673"  starttime datetime NOT NULL default '0000-00-00 00:00:00',"
     
    26392676"  type int(11) NOT NULL default '0',"
    26402677"  PRIMARY KEY  (chanid,starttime,mark,type)"
    26412678");",
     2679"CREATE TABLE IF NOT EXISTS recordedprogram ("
     2680"  chanid int(10) unsigned NOT NULL default '0',"
     2681"  starttime datetime NOT NULL default '0000-00-00 00:00:00',"
     2682"  endtime datetime NOT NULL default '0000-00-00 00:00:00',"
     2683"  title varchar(128) NOT NULL default '',"
     2684"  subtitle varchar(128) NOT NULL default '',"
     2685"  description text NOT NULL,"
     2686"  category varchar(64) NOT NULL default '',"
     2687"  category_type varchar(64) NOT NULL default '',"
     2688"  airdate year(4) NOT NULL default '0000',"
     2689"  stars float unsigned NOT NULL default '0',"
     2690"  previouslyshown tinyint(4) NOT NULL default '0',"
     2691"  title_pronounce varchar(128) NOT NULL default '',"
     2692"  stereo tinyint(1) NOT NULL default '0',"
     2693"  subtitled tinyint(1) NOT NULL default '0',"
     2694"  hdtv tinyint(1) NOT NULL default '0',"
     2695"  closecaptioned tinyint(1) NOT NULL default '0',"
     2696"  partnumber int(11) NOT NULL default '0',"
     2697"  parttotal int(11) NOT NULL default '0',"
     2698"  seriesid varchar(12) NOT NULL default '',"
     2699"  originalairdate date default NULL,"
     2700"  showtype varchar(30) NOT NULL default '',"
     2701"  colorcode varchar(20) NOT NULL default '',"
     2702"  syndicatedepisodenumber varchar(20) NOT NULL default '',"
     2703"  programid varchar(20) NOT NULL default '',"
     2704"  manualid int(10) unsigned NOT NULL default '0',"
     2705"  PRIMARY KEY  (chanid,starttime,manualid),"
     2706"  KEY endtime (endtime),"
     2707"  KEY title (title),"
     2708"  KEY title_pronounce (title_pronounce),"
     2709"  KEY seriesid (seriesid),"
     2710"  KEY programid (programid),"
     2711"  KEY id_start_end (chanid,starttime,endtime)"
     2712");",
    26422713"CREATE TABLE IF NOT EXISTS recordingprofiles ("
    26432714"  id int(10) unsigned NOT NULL auto_increment,"
    26442715"  name varchar(128) default NULL,"
     
    26472718"  profilegroup int(10) unsigned NOT NULL default '0',"
    26482719"  PRIMARY KEY  (id)"
    26492720");",
     2721"CREATE TABLE IF NOT EXISTS recordedrating ("
     2722"  chanid int(10) unsigned NOT NULL default '0',"
     2723"  starttime datetime NOT NULL default '0000-00-00 00:00:00',"
     2724"  system char(8) NOT NULL default '',"
     2725"  rating char(8) NOT NULL default '',"
     2726"  UNIQUE KEY chanid (chanid,starttime,system,rating),"
     2727"  KEY starttime (starttime,system)"
     2728");",
     2729"CREATE TABLE IF NOT EXISTS recordmatch ("
     2730"  recordid int unsigned,"
     2731"  chanid int unsigned,"
     2732"  starttime datetime,"
     2733"  manualid INT UNSIGNED,"
     2734"  INDEX (recordid)"
     2735");",
    26502736"CREATE TABLE IF NOT EXISTS recordoverride ("
    26512737"  recordid int(10) unsigned NOT NULL default '0',"
    26522738"  type int(10) unsigned NOT NULL default '0',"
     
    26642750"  hostname varchar(255) default NULL,"
    26652751"  KEY value (value,hostname)"
    26662752");",
     2753"CREATE TABLE IF NOT EXISTS videobookmarks ("
     2754"  filename varchar(255) NOT NULL,"
     2755"  bookmark varchar(128) default NULL,"
     2756"  PRIMARY KEY (filename)"
     2757");",
    26672758"CREATE TABLE IF NOT EXISTS videosource ("
    26682759"  sourceid int(10) unsigned NOT NULL auto_increment,"
    26692760"  name varchar(128) NOT NULL default '',"
     
    26752766"  PRIMARY KEY  (sourceid),"
    26762767"  UNIQUE KEY name (name)"
    26772768");",
     2769"CREATE TABLE IF NOT EXISTS xvmc_buffer_settings ( "
     2770"  id int(11) NOT NULL auto_increment, "
     2771"  description varchar(255) NOT NULL default '',"
     2772"  osd_num int(11) NOT NULL default '0',"
     2773"  osd_res_num int(11) NOT NULL default '0',"
     2774"  min_surf int(11) NOT NULL default '0',"
     2775"  max_surf int(11) NOT NULL default '0',"
     2776"  decode_num int(11) NOT NULL default '0',"
     2777"  agressive int(11) NOT NULL default '1',"
     2778"  PRIMARY KEY  (id) );",
     2779
     2780//# UK DVB-T
     2781"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',9018,'channel_numbers','131');",
     2782"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',9018,'guide_fixup','2');",
     2783//# Bell ExpressVu Canada
     2784"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',256,'guide_fixup','1');",
     2785"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',257,'guide_fixup','1');",
     2786"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',256,'tv_types','1,150,134,133');",
     2787"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',257,'tv_types','1,150,134,133');",
     2788
     2789"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4100,'sdt_mapping','1');",
     2790"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4101,'sdt_mapping','1');",
     2791"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4102,'sdt_mapping','1');",
     2792"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4103,'sdt_mapping','1');",
     2793"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4104,'sdt_mapping','1');",
     2794"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4105,'sdt_mapping','1');",
     2795"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4106,'sdt_mapping','1');",
     2796"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4107,'sdt_mapping','1');",
     2797"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4097,'sdt_mapping','1');",
     2798"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4098,'sdt_mapping','1');",
     2799
     2800"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4100,'tv_types','1,145,154');",
     2801"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4101,'tv_types','1,145,154');",
     2802"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4102,'tv_types','1,145,154');",
     2803"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4103,'tv_types','1,145,154');",
     2804"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4104,'tv_types','1,145,154');",
     2805"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4105,'tv_types','1,145,154');",
     2806"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4106,'tv_types','1,145,154');",
     2807"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4107,'tv_types','1,145,154');",
     2808"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4097,'tv_types','1,145,154');",
     2809"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4098,'tv_types','1,145,154');",
     2810
     2811"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4100,'guide_fixup','1');",
     2812"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4101,'guide_fixup','1');",
     2813"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4102,'guide_fixup','1');",
     2814"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4103,'guide_fixup','1');",
     2815"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4104,'guide_fixup','1');",
     2816"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4105,'guide_fixup','1');",
     2817"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4106,'guide_fixup','1');",
     2818"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4107,'guide_fixup','1');",
     2819"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4097,'guide_fixup','1');",
     2820"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4098,'guide_fixup','1');",
     2821"INSERT INTO dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES('dvb', '40999', 'guide_fixup', '4');",
     2822
     2823//# NSAB / Sirius
     2824"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',94,'tv_types','1,128');",
     2825//# WUNC Guide
     2826"INSERT into dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('atsc',1793,'guide_fixup','3');",
     2827
     2828"INSERT INTO dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',70,'force_guide_present','yes');",
     2829"INSERT INTO dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',70,'guide_ranges','80,80,96,96');",
     2830"INSERT INTO dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4112,'channel_numbers','131');",
     2831"INSERT INTO dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4115,'channel_numbers','131');",
     2832"INSERT INTO dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',4116,'channel_numbers','131');",
     2833"INSERT INTO dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',12802,'channel_numbers','131');",
     2834"INSERT INTO dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',12803,'channel_numbers','131');",
     2835"INSERT INTO dtv_privatetypes (sitype,networkid,private_type,private_value) VALUES ('dvb',12829,'channel_numbers','131');",
     2836
     2837"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');",
     2838
    26782839"INSERT INTO profilegroups SET name = 'Software Encoders (v4l based)', cardtype = 'V4L', is_default = 1;",
    26792840"INSERT INTO profilegroups SET name = 'MPEG-2 Encoders (PVR-x50, PVR-500)', cardtype = 'MPEG', is_default = 1;",
    26802841"INSERT INTO profilegroups SET name = 'Hardware MJPEG Encoders (Matrox G200-TV, Miro DC10, etc)', cardtype = 'MJPEG', is_default = 1;",
    26812842"INSERT INTO profilegroups SET name = 'Hardware HDTV', cardtype = 'HDTV', is_default = 1;",
    26822843"INSERT INTO profilegroups SET name = 'Hardware DVB Encoders', cardtype = 'DVB', is_default = 1;",
    26832844"INSERT INTO profilegroups SET name = 'Transcoders', cardtype = 'TRANSCODE', is_default = 1;",
     2845"INSERT INTO profilegroups SET name = 'FireWire Input', cardtype = 'FIREWIRE', is_default = 1;",
     2846"INSERT INTO profilegroups SET name = 'USB Mpeg-4 Encoder (Plextor ConvertX, etc)', cardtype = 'GO7007', is_default = 1;",
     2847"INSERT INTO profilegroups SET name = 'DBOX2 Input', cardtype = 'DBOX2', is_default = 1;",
    26842848"INSERT INTO recordingprofiles SET name = 'Default', profilegroup = 1;",
    26852849"INSERT INTO recordingprofiles SET name = 'Live TV', profilegroup = 1;",
    26862850"INSERT INTO recordingprofiles SET name = 'High Quality', profilegroup = 1;",
     
    27032867"INSERT INTO recordingprofiles SET name = 'Low Quality', profilegroup = 5;",
    27042868"INSERT INTO recordingprofiles SET name = 'RTjpeg/MPEG4', profilegroup = 6;",
    27052869"INSERT INTO recordingprofiles SET name = 'MPEG2', profilegroup = 6;",
     2870"INSERT INTO recordingprofiles SET name = 'High Quality', profilegroup = 6;",
     2871"INSERT INTO recordingprofiles SET name = 'Medium Quality', profilegroup = 6;",
     2872"INSERT INTO recordingprofiles SET name = 'Low Quality', profilegroup = 6;",
     2873"INSERT INTO recordingprofiles SET name = 'Default', profilegroup = 8;",
     2874"INSERT INTO recordingprofiles SET name = 'Live TV', profilegroup = 8;",
     2875"INSERT INTO recordingprofiles SET name = 'High Quality', profilegroup = 8;",
     2876"INSERT INTO recordingprofiles SET name = 'Low Quality', profilegroup = 8;",
     2877
    27062878"INSERT INTO settings SET value='mythfilldatabaseLastRunStart';",
    27072879"INSERT INTO settings SET value='mythfilldatabaseLastRunEnd';",
    27082880"INSERT INTO settings SET value='mythfilldatabaseLastRunStatus';",
    27092881"INSERT INTO settings SET value='DataDirectMessage';",
    27102882"INSERT INTO settings SET value='HaveRepeats', data='0';",
    2711 "INSERT INTO settings SET value='DBSchemaVer', data='1060';",
     2883"INSERT INTO settings SET value='DBSchemaVer', data='1099';",
     2884"INSERT INTO settings SET value = 'DefaultTranscoder', data = '0';",
     2885
     2886"INSERT INTO xvmc_buffer_settings VALUES (1,'Default / nVidia',2,2,8,16,8,1);",
     2887"INSERT INTO xvmc_buffer_settings VALUES (2,'VLD (More decode buffers)',2,2,8,16,16,1);",
    27122888""
    27132889};
    27142890
    27152891    QString dbver = "";
    2716     if (!performActualUpdate(updates, "1060", dbver))
     2892    if (!performActualUpdate(updates, "1099", dbver))
    27172893        return false;
    27182894    return true;
    27192895}