[mythtv-commits] mythtv/master commit: c32fcf7fd by Daniel Thor Kristjansson (daniel-kristjansson)

MythTV noreply at mythtv.org
Wed Nov 23 22:34:08 UTC 2011


      Author:  Daniel Thor Kristjansson <danielk at cuymedia.net>
 Change Date:  2011-11-23T13:43:26-08:00
   Push Date:  2011/11/23 14:33:53 -0800
  Repository:  mythtv
      Branch:  master
New Revision:  c32fcf7fdd5da12875010305d5f88f27c278bd75
   Changeset:  https://github.com/MythTV/mythtv/commit/c32fcf7fd

Log:

Respect config.xml and mysql.txt files if they exist.

At some point LoadDatabaseSettings() lost it's return value (it was still documented though)
and we started using UPnP to connect to a random mythtv database whenever we were unable to
connect to the configured database.

This returns the return value for mysql.txt parsing and does not do autodetection
if there is a mysql.txt. This also adds similar parsing of config.xml and also
respects those db connection values if they exist. If those files exist but we
are unable to connect to the configured database we bring up manual config in
GUI apps and abort startup of mythbackend. If neither of those files exist we use
UPnP autodetection.

Modified:

   mythtv/libs/libmyth/mythcontext.cpp
   mythtv/libs/libmythbase/mythdb.cpp
   mythtv/libs/libmythbase/mythdb.h
   mythtv/programs/mythbackend/mythsettings.cpp



More information about the mythtv-commits mailing list