The following conflicts occured because this tree originates from SVN directly, while the
tree which was merged was converted to git by others.

Conflicts:
	AUTHORS
	INSTALL
	Makefile
	NEWS
	README
	TODO
	asi.c
	comm.c
	comm.h
	demux.c
	dvb.c
	dvblast.1
	dvblast.c
	dvblast.h
	dvblast_mmi.sh
	dvblastctl.c
	en50221.c
	en50221.h
	output.c
	udp.c
	util.c
	version.h

gcc 4.6 reports:
  demux.c: In function HandleSection:
  demux.c:2267:61: warning: f may be used uninitialized in this function [-Wuninitialized]
  demux.c:2261:26: note: f was declared here

The gcc is correct that f is used initialized which is real bug in
this case.
Signed-off-by: Georgi Chorbadzhiyski <gf@unixsol.org>

Without this patch ECMs were handled only when CA descriptor was
in the main PMT loop.

This fixes regression against version 2.0.
Reported-By: JULIAN GARDNER <joolzg@btinternet.com>
Signed-Off-By: Georgi Chorbadzhiyski <georgi@unixsol.org>

Also increase COMM_HEADER_MAGIC to make 4-byte-header protocol incompatible
with new 8-byte-header.

The table describing commands was messed up and also
there was a break missing in command build up.

This is in order to get the "lock" message before PAT and PMTs.

Commit 102b40d2 added global cleanup function and made
i_fd variable global. Unfortunately i_fd definition was
not removed from main() so the cleanup function wasn't
really doing its job. The fix is simple just remove
the local definition of i_fd.
Signed-Off-By: Georgi Chorbadzhiyski <gf@unixsol.org>

XML output worked only for get_xxx and fe_status commands.
With this patch error messages are also available as XML.

Nice side effect is that error handling is now refactored
into return_error() function.
Signed-off-by: Georgi Chorbadzhiyski <gf@unixsol.org>

There should be no functional changes with this patch. It is
just a code cleanup.
Signed-off-by: Georgi Chorbadzhiyski <gf@unixsol.org>

This move is in preparation for command handling cleanup that will
follow next. No functional changes just code move.
Signed-off-by: Georgi Chorbadzhiyiski <gf@unixsol.org>

Switch dvblastctl to use table describing all commands. Also
report verbose errors when user have not supplied enough
arguments or unknown command.
Signed-off-by: Georgi Chorbadzhiyski <gf@unixsol.org>

These commands are the same as CMD_MMI_SEND but such split would
allow further cleanups.
Signed-off-by: Georgi Chorbadzhiyski <gf@unixsol.org>

Previously cmd socket worked only with DVB input. That was ok
since there were no commands (well except SHUTDOWN and RELOAD)
that were useful without DVB input. Now that lots of commands
were added to deal with input stream, this patch allows cmd
socket to be used with any input (ASI, DVB and UDP). DVB only
commands are ignored when there is no DVB input used.
Signed-off-by: Georgi Chorbadzhiyski <gf@unixsol.org>

Commit 5967be13 introduced ability to change provider and service
name per output. Unfortunately the condition where SDT have more
than one descriptor and service name descriptor is not the first
one was not tested even if there were code to handle multiple
descriptors. With patch even if desc 0x48 is not the first one
everything works as expected.

Globally set service provider can be changed for each
output by using /srvprovider= output option.
Signed-off-by: Georgi Chorbadzhiyski <gf@unixsol.org>

This patch adds two new output options that allow service
name and provider name to be changed per output. The new
output options are /srvname=XXX and /srvprovider=YYY.

If option is not set the values from input stream are used.
Signed-off-by: Georgi Chorbadzhiyski <gf@unixsol.org>

With this patch the DVBlast compilation output is not
cluttered with the full command lines and makes it easier to
spot warnings and errors. If you want to see what commands are
executed run make V=1 or export V=1 and then make.

The new "clean" output will look like this:

make all
  CC      dvblast.c
  CC      util.c
  CC      dvb.c
  CC      udp.c
  CC      asi.c
  CC      demux.c
  CC      output.c
  CC      en50221.c
  CC      comm.c
  CC      mrtg-cnt.c
  LINK    dvblast
  CC      dvblastctl.c
  LINK    dvblastctl

make install
  INSTALL dvblast.1 -> /usr/local/share/man/man1
  INSTALL dvblast dvblastctl dvblast_mmi.sh -> /usr/local/bin

make uninstall
  RM      /usr/local/bin/dvblast
  RM      /usr/local/bin/dvblastctl
  RM      /usr/local/bin/dvblast_mmi.sh
  RM      /usr/local/share/man/man1/dvblast.1

make clean
  CLEAN   dvblast dvblastctl dvblast.o util.o dvb.o udp.o asi.o demux.o output.o en50221.o comm.o mrtg-cnt.o util.o dvblastctl.o

make archive
  ARCHIVE dvblast-2.0.0.tar.bz2
  -rw-r--r-- 1 gf users 108030 Sep  9 12:12 dvblast-2.0.0.tar.bz2
Signed-off-by: Georgi Chorbadzhiyski <gf@unixsol.org>