Ticket #5692: programs_mythbackend-spelling-typos.patch

mythtv/programs/mythbackend/autoexpire.cpp

@@ -117 +117 @@
 }
 
 /** \fn AutoExpire::CalcParams()
- *   Calcualtes how much space needs to be cleared, and how often.
+ *   Calculates how much space needs to be cleared, and how often.
  */
 void AutoExpire::CalcParams()
 {
@@ -145 +145 @@
 
     // we use this copying on purpose. The used_encoders map ensures
     // that every encoder writes only to one fs.
-    // Copying the data minizes the time the lock is held
+    // Copying the data minimizes the time the lock is held
     instance_lock.lock();
     QMap<int, int>::const_iterator ueit = used_encoders.begin();
     while (ueit != used_encoders.end())
@@ -164 +164 @@
         fsMap[fsit->fsID] = 0;
         size_t thisKBperMin = 0;
 
-        // append unkown recordings to all fsIDs
+        // append unknown recordings to all fsIDs
         vector<int>::iterator unknownfs_it = fsEncoderMap[-1].begin();
         for (; unknownfs_it != fsEncoderMap[-1].end(); ++unknownfs_it)
             fsEncoderMap[fsit->fsID].push_back(*unknownfs_it);
@@ -252 +252 @@
  *  \brief This contains the main loop for the auto expire process.
  *
  *   Responsible for cleanup of old LiveTV programs as well as deleting as
- *   many expireable recordings as necessary to maintain enough free space
- *   on all directories in MythTV Storage Groups.  The thread deletes short
- *   LiveTV programs every 2 minutes and long LiveTV and regular programs
- *   as needed every "desired_freq" minutes.
+ *   many recordings that are eligible for expiration as necessary to
+ *   maintain enough free space on all directories in MythTV Storage Groups.
+ *   The thread deletes short LiveTV programs every 2 minutes and long
+ *   LiveTV and regular programs as needed every "desired_freq" minutes.
  */
 void AutoExpire::RunExpirer(void)
 {
@@ -271 +271 @@
     while (expire_thread_running)
     {
         curTime = QDateTime::currentDateTime();
-        // recalculate auto expire parametes
+        // recalculate auto expire parameters
         if (curTime >= next_expire)
             CalcParams();
 
@@ -454 +454 @@
             }
 
             VERBOSE(VB_FILE,
-                    "    Searching for expireable files in these directories");
+                    "    Searching for files eligible for expiration in these directories");
             QString myHostName = gContext->GetHostName();
             pginfolist_t::iterator it = expireList.begin();
             while ((it != expireList.end()) &&
@@ -516 +516 @@
                     fsit->freeSpaceKB += (p->filesize / 1024);
                     deleteList.push_back(p);
 
-                    VERBOSE(VB_FILE, QString("        FOUND Expireable file. "
+                    VERBOSE(VB_FILE, QString("        FOUND file eligible for expiration. "
                             "%1 @ %2 is located at %3 which is on fsID #%4. "
                             "Adding to deleteList.  After deleting we should "
                             "have %5 MB free on this filesystem.")
@@ -856 +856 @@
     {
         default:
         case emOldestFirst:
-            msg = "Adding expirable programs in Oldest First order";
+            msg = "Adding programs eligible for expiration in Oldest First order";
             where = "autoexpire > 0";
             if (gContext->GetNumSetting("AutoExpireWatchedPriority", 0))
                 orderby = "recorded.watched DESC, ";
             orderby += "starttime ASC";
             break;
         case emLowestPriorityFirst:
-            msg = "Adding expirable programs in Lowest Priority First order";
+            msg = "Adding programs eligible for expiration in Lowest Priority First order";
             where = "autoexpire > 0";
             if (gContext->GetNumSetting("AutoExpireWatchedPriority", 0))
                 orderby = "recorded.watched DESC, ";
             orderby += "recorded.recpriority ASC, starttime ASC";
             break;
         case emWeightedTimePriority:
-            msg = "Adding expirable programs in Weighted Time Priority order";
+            msg = "Adding programs eligible for expiration in Weighted Time Priority order";
             where = "autoexpire > 0";
             if (gContext->GetNumSetting("AutoExpireWatchedPriority", 0))
                 orderby = "recorded.watched DESC, ";

mythtv/programs/mythbackend/encoderlink.cpp

@@ -24 +24 @@
  * \class EncoderLink
  * \brief Provides an interface to both local and remote TVRec's for the mythbackend.
  *
- *  This class be instanciated for either a local or remote TVRec's.
+ *  This class be instantiated for either a local or remote TVRec's.
  *  Many of the methods will work with either, but many only work for
  *  a local TVRec's and these are labeled appropriately in this document.
  *
@@ -539 +539 @@
  *
  *  \param chain The LiveTV chain to use
  *  \param startchan The channel the LiveTV should start with
- *  \param pip Tells TVRec's RingBuffer that this is for a Picture in Picture di
-splay.
+ *  \param pip Tells TVRec's RingBuffer that this is for a Picture in Picture
+ *  display.
  *  \sa TVRec::SpawnLiveTV(LiveTVChain*,bool,QString),
  *      RemoteEncoder::SpawnLiveTV(QString,bool,QString)
  */

mythtv/programs/mythbackend/main.cpp

@@ -705 +705 @@
         (chanid.isEmpty() || starttime.isEmpty()) && infile.isEmpty())
     {
         cerr << "--generate-preview must be accompanied by either " <<endl
-             << "\nboth --chanid and --starttime paramaters, " << endl
-             << "\nor the --infile paramater." << endl;
+             << "\nboth --chanid and --starttime parameters, " << endl
+             << "\nor the --infile parameter." << endl;
         return BACKEND_EXIT_INVALID_CMDLINE;
     }
 

mythtv/programs/mythbackend/mainserver.cpp

@@ -608 +608 @@
             }
             else
                 VERBOSE(VB_IMPORTANT,
-                        "WARNING: Recieved an empty SHUTDOWN_NOW query!");
+                        "WARNING: Received an empty SHUTDOWN_NOW query!");
         }
     }
     else if (command == "BACKEND_MESSAGE")
@@ -1500 +1500 @@
 void MainServer::DoDeleteThread(const DeleteStruct *ds)
 {
     // sleep a little to let frontends reload the recordings list
-    // after deleteing a recording, then we can hammer the DB and filesystem
+    // after deleting a recording, then we can hammer the DB and filesystem
     sleep(3);
     usleep(rand()%2000);
 
@@ -1803 +1803 @@
  *
  *   When the file is small enough this closes the file and returns.
  *
- *   NOTE: This aquires a lock so that only one instance of TruncateAndClose()
+ *   NOTE: This acquires a lock so that only one instance of TruncateAndClose()
  *         is running at a time.
  */
 bool MainServer::TruncateAndClose(ProgramInfo *pginfo, int fd,
@@ -2098 +2098 @@
         }
     }
 
-    // Tell all encoders to stop recordering to the file being deleted.
+    // Tell all encoders to stop recording to the file being deleted.
     // Hopefully this is never triggered.
 
     QMap<int, EncoderLink *>::Iterator iter = encoderList->begin();
@@ -3487 +3487 @@
 {
 // Commercial break query
 // Format:  QUERY_COMMBREAK <chanid> <starttime>
-// chanid is chanid, starttime is startime of prorgram in
+// chanid is chanid, starttime is startime of program in
 //   # of seconds since Jan 1, 1970, in UTC time.  Same format as in
 //   a ProgramInfo structure in a string list.
 // Return structure is [number of rows] followed by a triplet of values:
@@ -3502 +3502 @@
 {
 // Cutlist query
 // Format:  QUERY_CUTLIST <chanid> <starttime>
-// chanid is chanid, starttime is startime of prorgram in
+// chanid is chanid, starttime is startime of program in
 //   # of seconds since Jan 1, 1970, in UTC time.  Same format as in
 //   a ProgramInfo structure in a string list.
 // Return structure is [number of rows] followed by a triplet of values:
@@ -3517 +3517 @@
                                      PlaybackSock *pbs)
 // Bookmark query
 // Format:  QUERY_BOOKMARK <chanid> <starttime>
-// chanid is chanid, starttime is startime of prorgram in
+// chanid is chanid, starttime is startime of program in
 //   # of seconds since Jan 1, 1970, in UTC time.  Same format as in
 //   a ProgramInfo structure in a string list.
 // Return value is a long-long encoded as two separate values
@@ -3549 +3549 @@
 {
 // Bookmark query
 // Format:  SET_BOOKMARK <chanid> <starttime> <long part1> <long part2>
-// chanid is chanid, starttime is startime of prorgram in
+// chanid is chanid, starttime is startime of program in
 //   # of seconds since Jan 1, 1970, in UTC time.  Same format as in
 //   a ProgramInfo structure in a string list.  The two longs are the two
 //   portions of the bookmark value to set.

mythtv/programs/mythbackend/mythxml.cpp

@@ -598 +598 @@
 
             sCurChanId = pInfo->chanid;
 
-            // Ouput new Channel Node
+            // Output new Channel Node
 
             channel = doc.createElement( "Channel" );
             channels.appendChild( channel );

mythtv/programs/mythbackend/scheduler.cpp

@@ -2939 +2939 @@
         p->schedulerid =
             p->startts.toString() + "_" + p->chanid;
 
-        // Chedk to see if the program is currently recording and if
+        // Check to see if the program is currently recording and if
         // the end time was changed.  Ideally, checking for a new end
         // time should be done after PruneOverlaps, but that would
         // complicate the list handling.  Do it here unless it becomes

mythtv/programs/mythbackend/upnpcdsmusic.cpp

@@ -1 +1 @@
 //////////////////////////////////////////////////////////////////////////////
 // Program Name: upnpcdsmusic.cpp
 //                                                                            
-// Purpose - uPnp Content Directory Extention for Music  
+// Purpose - uPnp Content Directory Extension for Music  
 //                                                                            
 // Created By  : David Blain                    Created On : Jan. 24, 2005
 // Modified By :                                Modified On:                  

mythtv/programs/mythbackend/upnpcdstv.cpp

@@ -1 +1 @@
 //////////////////////////////////////////////////////////////////////////////
 // Program Name: upnpcdstv.cpp
 //                                                                            
-// Purpose - uPnp Content Directory Extention for Recorded TV  
+// Purpose - uPnp Content Directory Extension for Recorded TV  
 //                                                                            
 // Created By  : David Blain                    Created On : Jan. 24, 2005
 // Modified By :                                Modified On:                  

mythtv/programs/mythbackend/upnpcdsvideo.cpp

@@ -1 +1 @@
 // Program Name: upnpcdsvideo.cpp
 //                                                                            
-// Purpose - uPnp Content Directory Extention for MythVideo Videos
+// Purpose - uPnp Content Directory Extension for MythVideo Videos
 //                                                                            
 //////////////////////////////////////////////////////////////////////////////