Commit Graph

3790 Commits

Author SHA1 Message Date
[CST] Focus
0685ab60e3 gui/scan_setup.cpp: fix old merge
Origin commit data
------------------
Commit: 827a0fa5d7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-31 (Thu, 31 Jan 2013)
2013-01-31 17:21:21 +04:00
[CST] Focus
47f327accf Revert "configure scripts: add boxmodel"
This reverts commit 9c033b665d.


Origin commit data
------------------
Commit: 6f00785528
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-31 (Thu, 31 Jan 2013)
2013-01-31 16:59:50 +04:00
[CST] Focus
5500935ea1 Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
Origin commit data
------------------
Commit: 3517bba9d6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-31 (Thu, 31 Jan 2013)
2013-01-31 16:57:32 +04:00
Jacek Jendrzej
24df83b2c9 add .rej ~ to .gitignore
Origin commit data
------------------
Commit: 43aaec7cfc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-31 (Thu, 31 Jan 2013)

Origin message was:
------------------
-add .rej ~ to .gitignore
2013-01-31 12:24:34 +01:00
Jacek Jendrzej
97d55b8e2d src/gui/channellist.cpp: minitv osd fix
Origin commit data
------------------
Commit: 17cfb97f9e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-31 (Thu, 31 Jan 2013)
2013-01-31 11:14:38 +01:00
Jacek Jendrzej
9035cc0a81 delete src/neutrino.cpp.~ .rej
Origin commit data
------------------
Commit: 15623981df
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)
2013-01-30 23:52:31 +01:00
Jacek Jendrzej
a597c84fc7 delete src/gui/channellist.cpp.rej
Origin commit data
------------------
Commit: 1d1f1e3ae9
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)
2013-01-30 23:49:43 +01:00
Jacek Jendrzej
e6a274218b delete src/gui/channellist.cpp~
Origin commit data
------------------
Commit: 8c0ac9e724
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)
2013-01-30 23:47:25 +01:00
Jacek Jendrzej
a3d0075c20 add locale minitv
Origin commit data
------------------
Commit: 5803ddf873
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)

Origin message was:
------------------
-add locale minitv
2013-01-30 23:41:40 +01:00
Jacek Jendrzej
f1144f8192 src/gui/channellist.cpp: fix minitv gui & segfault
Origin commit data
------------------
Commit: e509f19361
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)
2013-01-30 23:37:11 +01:00
Jacek Jendrzej
6d3022d182 compil fix for commit eedc2330d9
Origin commit data
------------------
Commit: deeed028d4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)
2013-01-30 19:31:57 +01:00
TangoCash
eedc2330d9 add optional mini-tv to channellist
Signed-off-by: satbaby <crashdvb@googlemail.com>


Origin commit data
------------------
Commit: 1a425308ed
Author: TangoCash <eric@loxat.de>
Date: 2013-01-30 (Wed, 30 Jan 2013)
2013-01-30 19:17:52 +01:00
[CST] Focus
4e31dce23f zapit/src/femanager.cpp: fix cleanup on delete
Origin commit data
------------------
Commit: b0eb071af1
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)
2013-01-30 17:56:44 +04:00
[CST] Focus
fefca6f427 system/setting_helpers.cpp: fix unused warning on apollo
Origin commit data
------------------
Commit: ced8b191b1
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)
2013-01-30 17:53:56 +04:00
[CST] Focus
3fe71fe637 acinclude.m4: set default box type to nevis
Origin commit data
------------------
Commit: 258d2b8666
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)
2013-01-30 14:28:07 +04:00
[CST] Focus
59febc76c3 nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp: filter channels, show real channel number
Origin commit data
------------------
Commit: 720bfba267
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)
2013-01-30 13:05:08 +04:00
[CST] Focus
630df297e3 gui/timerlist.cpp: filter bouquets channels
Origin commit data
------------------
Commit: 6fe4b8aad4
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)
2013-01-30 11:54:49 +04:00
[CST] Focus
fb16ff4363 gui/zapit_setup.cpp: filter bouquets channels,
fix return values to close all menus on menu key


Origin commit data
------------------
Commit: 62529ede9c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)
2013-01-30 11:39:51 +04:00
[CST] Focus
b2deac480d zapit/src/bouquets.cpp: fix copy/paste in getRadioChannels
Origin commit data
------------------
Commit: 55e3db20b8
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)
2013-01-30 11:37:08 +04:00
[CST] Focus
5e93ba0b6b configure.ac: always define HAVE_COOLSTREAM_NEVIS_IR_H, ifdef in rcinput.h decide what to include
Origin commit data
------------------
Commit: 6724414335
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)
2013-01-30 11:16:24 +04:00
[CST] Focus
0ad47b872c Merge branch 'dvbsi++' into next
Origin commit data
------------------
Commit: e5c032b032
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)
2013-01-30 11:07:59 +04:00
[CST] Focus
ae6cbaa232 Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
Origin commit data
------------------
Commit: 1e444d2f61
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)
2013-01-30 11:06:54 +04:00
Stefan Seyfried
82c113dfdd bouquets: fix ubouquet generation for broken services
Services with duplicate tsid/onid/sid like found e.g. on "8W Atlantic
Bird 2", "12.5W Atlantic Bird 1", "4.8E Sirius", "7E Eutelsat" caused
wrong bouquet entries because the satellite position and transponder
frequency was not used to distinguish the channels. Use the new
FindChannelFuzzy() function to fix this.


Origin commit data
------------------
Commit: 70b3ef04f9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-01-29 (Tue, 29 Jan 2013)

Origin message was:
------------------
bouquets: fix ubouquet generation for broken services

Services with duplicate tsid/onid/sid like found e.g. on "8W Atlantic
Bird 2", "12.5W Atlantic Bird 1", "4.8E Sirius", "7E Eutelsat" caused
wrong bouquet entries because the satellite position and transponder
frequency was not used to distinguish the channels. Use the new
FindChannelFuzzy() function to fix this.
2013-01-29 22:50:23 +01:00
Stefan Seyfried
b906d983da getservices: add FindChannelFuzzy() function
Add a function that returns a channel if tsid, onid, sid and
satellite position matches and the frequency matches +-2MHz.
(This frequency tolerance allows ubouquets to be used after
updates to satellites.xml)


Origin commit data
------------------
Commit: 536484f698
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-01-29 (Tue, 29 Jan 2013)
2013-01-29 22:50:23 +01:00
[CST] Focus
eeb539e8e9 Merge branch 'dvbsi++' into next
Origin commit data
------------------
Commit: 5776c67825
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-29 (Tue, 29 Jan 2013)
2013-01-29 17:42:19 +04:00
[CST] Focus
9c033b665d configure scripts: add boxmodel
Origin commit data
------------------
Commit: 38461dca6c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-29 (Tue, 29 Jan 2013)
2013-01-29 17:41:06 +04:00
[CST] Focus
2d52dca352 Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
Origin commit data
------------------
Commit: 66a2e68946
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-29 (Tue, 29 Jan 2013)
2013-01-29 17:39:13 +04:00
[CST] Focus
ba3ac836bc system/flashtool.cpp: fix buffer size for nor
Origin commit data
------------------
Commit: d1cbff900f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-29 (Tue, 29 Jan 2013)
2013-01-29 17:38:39 +04:00
vanhofen
1b297bb909 neutrino.cpp: fix wrong configfile in loadKeys()
Origin commit data
------------------
Commit: 1320462626
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-01-29 (Tue, 29 Jan 2013)

Origin message was:
------------------
- neutrino.cpp: fix wrong configfile in loadKeys()
2013-01-29 13:13:55 +01:00
[CST] Focus
987520bdb1 .gitignore: add generated src/nhttpd/nhttpd.conf
Origin commit data
------------------
Commit: b0e404922a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-29 (Tue, 29 Jan 2013)
2013-01-29 14:49:25 +04:00
[CST] Focus
bd43e4ecc8 system/setting_helpers.cpp: use CONFIGDIR to remove xml/conf files
Origin commit data
------------------
Commit: 4b10e2e7c9
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-29 (Tue, 29 Jan 2013)
2013-01-29 14:48:00 +04:00
[CST] Focus
946d0f1eaa gui/start_wizard.cpp: copy initial settings using CONFIGDIR
Origin commit data
------------------
Commit: 6804d18d1c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-29 (Tue, 29 Jan 2013)
2013-01-29 14:44:45 +04:00
[CST] Focus
2d9515be5a Merge branch 'next' of 109.75.98.228:cst-private-neutrino into next
Origin commit data
------------------
Commit: 8763ab3fe0
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-29 (Tue, 29 Jan 2013)
2013-01-29 14:25:08 +04:00
[CST] Focus
c29d2fa06c gui/update.cpp: use mtd0 as default on apollo, disable uboot/uldr partitions write
Origin commit data
------------------
Commit: 5f105f2ee3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-29 (Tue, 29 Jan 2013)
2013-01-29 14:24:47 +04:00
[CST] Focus
beef75007f system/flashtool.cpp: add bad block skip for read/write/erase in case of NAND
Origin commit data
------------------
Commit: e739868e7c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-29 (Tue, 29 Jan 2013)
2013-01-29 14:23:50 +04:00
[CST] Bas
b61891f11e Merge branch 'next' of coolstreamtech.de:cst-private-neutrino into next
Origin commit data
------------------
Commit: 34187b12cd
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2013-01-28 (Mon, 28 Jan 2013)
2013-01-29 01:21:50 +08:00
[CST] Bas
31c7c64ecc neutrino: fix file location.
Origin commit data
------------------
Commit: 1babe68529
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2013-01-28 (Mon, 28 Jan 2013)
2013-01-29 01:20:55 +08:00
[CST] Bas
faf0c6eb8c neutrino make nhttpd depend on neutrino's config.
Origin commit data
------------------
Commit: d1046fd8a5
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2013-01-28 (Mon, 28 Jan 2013)
2013-01-29 01:20:28 +08:00
[CST] Bas
a310363ee8 neutrino: add multiple paths so they can be configured and not be hard-coded in
multiple files.


Origin commit data
------------------
Commit: ee169288a5
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2013-01-28 (Mon, 28 Jan 2013)

Origin message was:
------------------
neutrino: add multiple paths so they can be configured and not be hard-coded in
     multiple files.
2013-01-29 01:18:38 +08:00
[CST] Bas
b5a1d18588 neutrino: remove space from nhttpd.conf.in.
Origin commit data
------------------
Commit: 9055caf32b
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2013-01-28 (Mon, 28 Jan 2013)
2013-01-29 01:17:23 +08:00
[CST] Bas
8d93c37d70 neutrino: make default language english.
Origin commit data
------------------
Commit: fb81654ef2
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2013-01-28 (Mon, 28 Jan 2013)
2013-01-29 01:10:07 +08:00
[CST] Bas
846bb9414a neutrino: add predefined config for nhttpd.
Origin commit data
------------------
Commit: 8e8b65e9d2
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2013-01-28 (Mon, 28 Jan 2013)
2013-01-29 01:06:26 +08:00
[CST] Focus
83a2a9b5b1 neutrino.cpp: get bouquets with filtering;
move HD bouquet to 'all' to use sorting on it


Origin commit data
------------------
Commit: d591e90395
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-28 (Mon, 28 Jan 2013)
2013-01-28 14:44:45 +04:00
[CST] Focus
8880bba8e8 zapit/src/scansdt.cpp: add missed channel flags - they should not be 0
Origin commit data
------------------
Commit: ea8c9c2356
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-28 (Mon, 28 Jan 2013)
2013-01-28 13:58:45 +04:00
[CST] Focus
3f94d01aed zapit/src/getservices.cpp: add flags filter to all get channels functions,
change default filter flags to PRESENT (new+updated),
dont save channels with NOT_FOUND flag


Origin commit data
------------------
Commit: 776377089c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-28 (Mon, 28 Jan 2013)
2013-01-28 12:06:41 +04:00
[CST] Focus
158b8adb83 zapit/src/bouquets.cpp: dont clear user-bouquets in 'erase' mode;
add helpers to get filtered channel lists;
add channels not present in services.xml with NOT_FOUND flag


Origin commit data
------------------
Commit: a4005bc75c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-28 (Mon, 28 Jan 2013)
2013-01-28 12:03:03 +04:00
[CST] Focus
dfd836c915 zapit/src/scansdt.cpp: set existing channel's flags to UPDATED
Origin commit data
------------------
Commit: c8414974fa
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-28 (Mon, 28 Jan 2013)
2013-01-28 11:56:54 +04:00
[CST] Focus
a313394438 data/locale/english.locale: change bouquets mode 'erase all' to 'erase old'
Origin commit data
------------------
Commit: c7ef67ac84
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-28 (Mon, 28 Jan 2013)
2013-01-28 11:50:41 +04:00
[CST] Focus
4eb63dd985 zapit/src/fastscan.cpp: set channels flags to UPDATED
Origin commit data
------------------
Commit: 189635fd6f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-28 (Mon, 28 Jan 2013)
2013-01-28 11:49:39 +04:00
[CST] Focus
343f316273 zapit/include/zapit/channel.h: add NOT_FOUND flag to mark channels not present in services.xml
Origin commit data
------------------
Commit: 75cc4b4c9e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-28 (Mon, 28 Jan 2013)
2013-01-28 11:48:38 +04:00