Merge branch 'master' into new-logging

MythTV · Jun 6, 2011 · d3d4440 · d3d4440
2 parents 9c93196 + 02881f3
commit d3d4440
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/mythtv/libs/libmythbase/mythcorecontext.h b/mythtv/libs/libmythbase/mythcorecontext.h
@@ -24,6 +24,7 @@
 #define MYTH_APPNAME_MYTHMESSAGE "mythmessage"
 #define MYTH_APPNAME_MYTHLCDSERVER "mythlcdserver"
 #define MYTH_APPNAME_MYTHAVTEST "mythavtest"
+#define MYTH_APPNAME_MYTHMEDIASERVER "mythmediaserver"
 
 class MDBManager;
 class MythCoreContextPrivate;

diff --git a/mythtv/libs/libmythtv/ringbuffer.cpp b/mythtv/libs/libmythtv/ringbuffer.cpp
@@ -767,7 +767,7 @@ void RingBuffer::run(void)
                     (now.tv_usec - lastread.tv_usec) / 1000;
                 readtimeavg = (readtimeavg * 9 + readinterval) / 10;
 
-                if (readtimeavg < 150 && (uint)readblocksize < (bufferSize>>2))
+                if (readtimeavg < 150 && (uint)readblocksize < (BUFFER_SIZE_MINIMUM >>2))
                 {
                     int old_block_size = readblocksize;
                     readblocksize = 3 * readblocksize / 2;

diff --git a/mythtv/programs/mythmediaserver/.gitignore b/mythtv/programs/mythmediaserver/.gitignore
@@ -0,0 +1 @@
+mythmediaserver
diff --git a/mythtv/programs/mythmediaserver/main.cpp b/mythtv/programs/mythmediaserver/main.cpp
@@ -125,7 +125,7 @@ int main(int argc, char *argv[])
     int argpos = 1;
     bool daemonize = false;
 
-    QCoreApplication::setApplicationName(MYTH_APPNAME_MYTHJOBQUEUE);
+    QCoreApplication::setApplicationName(MYTH_APPNAME_MYTHMEDIASERVER);
 
     QString filename;
 
@@ -288,7 +288,7 @@ int main(int argc, char *argv[])
     }
 
     VERBOSE(VB_IMPORTANT, QString("%1 version: %2 [%3] www.mythtv.org")
-                            .arg(MYTH_APPNAME_MYTHJOBQUEUE)
+                            .arg(MYTH_APPNAME_MYTHMEDIASERVER)
                             .arg(MYTH_SOURCE_PATH)
                             .arg(MYTH_SOURCE_VERSION));