Commit Graph

3608 Commits

Author SHA1 Message Date
[CST] Focus
9c58bf77fc Merge branch 'next' of 109.75.98.228:cst-private-neutrino into next
Origin commit data
------------------
Branch: ni/coolstream
Commit: 752f404654
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-04 (Mon, 04 Feb 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-02-04 11:02:51 +04:00
[CST] Focus
1a7de96560 Merge branch 'dvbsi++' into next
Origin commit data
------------------
Branch: ni/coolstream
Commit: d7f4535207
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-04 (Mon, 04 Feb 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-02-04 11:02:31 +04:00
[CST] Focus
0d2f8feaf5 Merge branch 'dvbsi++' of 109.75.98.228:cst-private-neutrino into dvbsi++
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3727b0ea53
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-04 (Mon, 04 Feb 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-02-04 11:02:00 +04:00
[CST] Bas
30c52663f9 Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into dvbsi++
Origin commit data
------------------
Branch: ni/coolstream
Commit: 23257d5bae
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2013-02-04 (Mon, 04 Feb 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-02-04 14:46:44 +08:00
[CST] Bas
32df35fe4c cam_menu.cpp: handle ENQ objects correctly.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3ffe8b1d23
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2013-02-04 (Mon, 04 Feb 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-02-04 14:43:55 +08:00
[CST] Bas
eceb414876 neutrino: add a input object for Enquiry Objects from CI. They specify if the
input has to be blind.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 02b649a6f4
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2013-02-04 (Mon, 04 Feb 2013)

Origin message was:
------------------
neutrino: add a input object for Enquiry Objects from CI. They specify if the
     input has to be blind.


------------------
This commit was generated by Migit
2013-02-04 14:42:40 +08:00
[CST] Focus
e802f73d5c Merge branch 'dvbsi++' into next
Origin commit data
------------------
Branch: ni/coolstream
Commit: 43d825b62e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-04 (Mon, 04 Feb 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-02-04 10:06:00 +04:00
[CST] Focus
0ab0473c6e Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9c4065257c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-04 (Mon, 04 Feb 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-02-04 10:04:05 +04:00
Michael Liebmann
9554af5953 src/gui/channellist.cpp: miniTV fix locale
- Add locale for menuhint
- Sort header for locale


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1c85803632
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-02-03 (Sun, 03 Feb 2013)

Origin message was:
------------------
* src/gui/channellist.cpp: miniTV fix locale

- Add locale for menuhint
- Sort header for locale


------------------
This commit was generated by Migit
2013-02-03 07:38:45 +01:00
vanhofen
5c3119d73f channellist.cpp: rework header and buttonbar
* paint channellogo in mini-tv-mode
* strech the positions of right elements in header marginally
* paint buttonbar over the full width


Origin commit data
------------------
Branch: ni/coolstream
Commit: 77bbdfa0c9
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-02 (Sat, 02 Feb 2013)

Origin message was:
------------------
- channellist.cpp: rework header and buttonbar

* paint channellogo in mini-tv-mode
* strech the positions of right elements in header marginally
* paint buttonbar over the full width


------------------
This commit was generated by Migit
2013-02-02 02:10:35 +01:00
vanhofen
28a4b5f5d6 channellist.cpp: change color for infozone
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1e45607ae1
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-01 (Fri, 01 Feb 2013)

Origin message was:
------------------
- channellist.cpp: change color for infozone

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-02-01 23:26:33 +01:00
vanhofen
95a719d92e channellist.cpp: fix round borders for infozone
Origin commit data
------------------
Branch: ni/coolstream
Commit: ec4a5bf3c1
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-01 (Fri, 01 Feb 2013)

Origin message was:
------------------
- channellist.cpp: fix round borders for infozone

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-02-01 22:59:07 +01:00
Michael Liebmann
3378aeeb50 src/gui/channellist.cpp: miniTV osd fix
- Screen coordinate x could possibly receive a value under 0


Origin commit data
------------------
Branch: ni/coolstream
Commit: 49667088f7
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-01-31 (Thu, 31 Jan 2013)

Origin message was:
------------------
* src/gui/channellist.cpp: miniTV osd fix

- Screen coordinate x could possibly receive a value under 0


------------------
This commit was generated by Migit
2013-01-31 20:05:03 +01:00
vanhofen
2ec2af7c3f cables.xml: add "antennengemeinschaft penig"
thx Zeng!


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4b8d0e156e
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-01-31 (Thu, 31 Jan 2013)

Origin message was:
------------------
- cables.xml: add "antennengemeinschaft penig"

thx Zeng!


------------------
This commit was generated by Migit
2013-01-31 17:28:18 +01:00
Stefan Seyfried
b18550b836 getservices: fix FindChannelFuzzy()
* for services with duplicate tsid/onid/sid, not all channels were found
 (function returned NULL if the first match was not the correct one)
* add compatibility with "wrong" ubouquets.xml for non-sat boxes: the
 position parameter was ignored before and is not too useful outside
 sat anyway


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0995ff5042
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-01-31 (Thu, 31 Jan 2013)

Origin message was:
------------------
getservices: fix FindChannelFuzzy()

* for services with duplicate tsid/onid/sid, not all channels were found
 (function returned NULL if the first match was not the correct one)
* add compatibility with "wrong" ubouquets.xml for non-sat boxes: the
 position parameter was ignored before and is not too useful outside
 sat anyway


------------------
This commit was generated by Migit
2013-01-31 16:51:43 +01:00
Jacek Jendrzej
fe38ed371a src/gui/channellist.cpp: fix possible segfault
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2e5b54c509
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-31 (Thu, 31 Jan 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-01-31 16:18:05 +01:00
[CST] Focus
4d4d24e7fa gui/scan_setup.cpp: fix old merge
Origin commit data
------------------
Branch: ni/coolstream
Commit: 72d53fa44d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-31 (Thu, 31 Jan 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-01-31 18:01:19 +04:00
[CST] Focus
c641e5c0f8 Merge branch 'dvbsi++' into next
Origin commit data
------------------
Branch: ni/coolstream
Commit: bcd02435dd
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-31 (Thu, 31 Jan 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-01-31 17:40:19 +04:00
[CST] Focus
eaf824bb8e gui/scan_setup.cpp: fix old merge
Origin commit data
------------------
Branch: ni/coolstream
Commit: 827a0fa5d7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-31 (Thu, 31 Jan 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-01-31 17:21:21 +04:00
[CST] Focus
c077a02e43 Revert "configure scripts: add boxmodel"
This reverts commit ff23414e8d.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6f00785528
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-31 (Thu, 31 Jan 2013)



------------------
This commit was generated by Migit
2013-01-31 16:59:50 +04:00
[CST] Focus
02db6c7256 Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3517bba9d6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-31 (Thu, 31 Jan 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-01-31 16:57:32 +04:00
Jacek Jendrzej
ec290afd12 add .rej ~ to .gitignore
Origin commit data
------------------
Branch: ni/coolstream
Commit: 43aaec7cfc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-31 (Thu, 31 Jan 2013)

Origin message was:
------------------
-add .rej ~ to .gitignore

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-01-31 12:24:34 +01:00
Jacek Jendrzej
141b1b9d65 src/gui/channellist.cpp: minitv osd fix
Origin commit data
------------------
Branch: ni/coolstream
Commit: 17cfb97f9e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-31 (Thu, 31 Jan 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-01-31 11:14:38 +01:00
Jacek Jendrzej
3ca4aae394 delete src/neutrino.cpp.~ .rej
Origin commit data
------------------
Branch: ni/coolstream
Commit: 15623981df
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-01-30 23:52:31 +01:00
Jacek Jendrzej
1798a3e20d delete src/gui/channellist.cpp.rej
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1d1f1e3ae9
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-01-30 23:49:43 +01:00
Jacek Jendrzej
11273b685f delete src/gui/channellist.cpp~
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8c0ac9e724
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-01-30 23:47:25 +01:00
Jacek Jendrzej
07ff520ab7 add locale minitv
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5803ddf873
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)

Origin message was:
------------------
-add locale minitv

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-01-30 23:41:40 +01:00
Jacek Jendrzej
08873a05cc src/gui/channellist.cpp: fix minitv gui & segfault
Origin commit data
------------------
Branch: ni/coolstream
Commit: e509f19361
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-01-30 23:37:11 +01:00
Jacek Jendrzej
f6f0911121 compil fix for commit 263340cd22
Origin commit data
------------------
Branch: ni/coolstream
Commit: deeed028d4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-01-30 19:31:57 +01:00
TangoCash
263340cd22 add optional mini-tv to channellist
Signed-off-by: satbaby <crashdvb@googlemail.com>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1a425308ed
Author: TangoCash <eric@loxat.de>
Date: 2013-01-30 (Wed, 30 Jan 2013)



------------------
This commit was generated by Migit
2013-01-30 19:17:52 +01:00
[CST] Focus
bd7776cc70 zapit/src/femanager.cpp: fix cleanup on delete
Origin commit data
------------------
Branch: ni/coolstream
Commit: b0eb071af1
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-01-30 17:56:44 +04:00
[CST] Focus
8bea427f0f system/setting_helpers.cpp: fix unused warning on apollo
Origin commit data
------------------
Branch: ni/coolstream
Commit: ced8b191b1
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-01-30 17:53:56 +04:00
[CST] Focus
f8c50d1c83 acinclude.m4: set default box type to nevis
Origin commit data
------------------
Branch: ni/coolstream
Commit: 258d2b8666
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-01-30 14:28:07 +04:00
[CST] Focus
9e79b81b06 nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp: filter channels, show real channel number
Origin commit data
------------------
Branch: ni/coolstream
Commit: 720bfba267
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-01-30 13:05:08 +04:00
[CST] Focus
43c42552ba gui/timerlist.cpp: filter bouquets channels
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6fe4b8aad4
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-01-30 11:54:49 +04:00
[CST] Focus
58f7a4b46e gui/zapit_setup.cpp: filter bouquets channels,
fix return values to close all menus on menu key


Origin commit data
------------------
Branch: ni/coolstream
Commit: 62529ede9c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)



------------------
This commit was generated by Migit
2013-01-30 11:39:51 +04:00
[CST] Focus
0f2d592367 zapit/src/bouquets.cpp: fix copy/paste in getRadioChannels
Origin commit data
------------------
Branch: ni/coolstream
Commit: 55e3db20b8
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-01-30 11:37:08 +04:00
[CST] Focus
af0e559aeb configure.ac: always define HAVE_COOLSTREAM_NEVIS_IR_H, ifdef in rcinput.h decide what to include
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6724414335
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-01-30 11:16:24 +04:00
[CST] Focus
35b8f6fb94 Merge branch 'dvbsi++' into next
Origin commit data
------------------
Branch: ni/coolstream
Commit: e5c032b032
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-01-30 11:07:59 +04:00
[CST] Focus
eaf2141b97 Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1e444d2f61
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-01-30 11:06:54 +04:00
Stefan Seyfried
091694a83a 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
------------------
Branch: ni/coolstream
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.


------------------
This commit was generated by Migit
2013-01-29 22:50:23 +01:00
Stefan Seyfried
9415909c8e 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
------------------
Branch: ni/coolstream
Commit: 536484f698
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-01-29 (Tue, 29 Jan 2013)



------------------
This commit was generated by Migit
2013-01-29 22:50:23 +01:00
[CST] Focus
e4eee9ae88 Merge branch 'dvbsi++' into next
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5776c67825
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-29 (Tue, 29 Jan 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-01-29 17:42:19 +04:00
[CST] Focus
ff23414e8d configure scripts: add boxmodel
Origin commit data
------------------
Branch: ni/coolstream
Commit: 38461dca6c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-29 (Tue, 29 Jan 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-01-29 17:41:06 +04:00
[CST] Focus
cff4236104 Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
Origin commit data
------------------
Branch: ni/coolstream
Commit: 66a2e68946
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-29 (Tue, 29 Jan 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-01-29 17:39:13 +04:00
[CST] Focus
4d50af1aaa system/flashtool.cpp: fix buffer size for nor
Origin commit data
------------------
Branch: ni/coolstream
Commit: d1cbff900f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-29 (Tue, 29 Jan 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-01-29 17:38:39 +04:00
vanhofen
785d3f2046 neutrino.cpp: fix wrong configfile in loadKeys()
Origin commit data
------------------
Branch: ni/coolstream
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()

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-01-29 13:13:55 +01:00
[CST] Focus
fa3a6cc36c .gitignore: add generated src/nhttpd/nhttpd.conf
Origin commit data
------------------
Branch: ni/coolstream
Commit: b0e404922a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-29 (Tue, 29 Jan 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-01-29 14:49:25 +04:00
[CST] Focus
944cefbac2 system/setting_helpers.cpp: use CONFIGDIR to remove xml/conf files
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4b10e2e7c9
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-29 (Tue, 29 Jan 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-01-29 14:48:00 +04:00
[CST] Focus
010749fda3 gui/start_wizard.cpp: copy initial settings using CONFIGDIR
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6804d18d1c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-29 (Tue, 29 Jan 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-01-29 14:44:45 +04:00