Fixes any spelling or typos found in the comments From: Erik Hovland --- mythtv/programs/mythbackend/autoexpire.cpp | 26 +++++++++++++------------- mythtv/programs/mythbackend/encoderlink.cpp | 6 +++--- mythtv/programs/mythbackend/main.cpp | 4 ++-- mythtv/programs/mythbackend/mainserver.cpp | 16 ++++++++-------- mythtv/programs/mythbackend/mythxml.cpp | 2 +- mythtv/programs/mythbackend/scheduler.cpp | 2 +- mythtv/programs/mythbackend/upnpcdsmusic.cpp | 2 +- mythtv/programs/mythbackend/upnpcdstv.cpp | 2 +- mythtv/programs/mythbackend/upnpcdsvideo.cpp | 2 +- 9 files changed, 31 insertions(+), 31 deletions(-) diff --git a/mythtv/programs/mythbackend/autoexpire.cpp b/mythtv/programs/mythbackend/autoexpire.cpp index 13906f3..34fd685 100644 --- a/mythtv/programs/mythbackend/autoexpire.cpp +++ b/mythtv/programs/mythbackend/autoexpire.cpp @@ -117,7 +117,7 @@ size_t AutoExpire::GetDesiredSpace(int fsID) const } /** \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,7 +145,7 @@ void AutoExpire::CalcParams() // 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::const_iterator ueit = used_encoders.begin(); while (ueit != used_encoders.end()) @@ -164,7 +164,7 @@ void AutoExpire::CalcParams() fsMap[fsit->fsID] = 0; size_t thisKBperMin = 0; - // append unkown recordings to all fsIDs + // append unknown recordings to all fsIDs vector::iterator unknownfs_it = fsEncoderMap[-1].begin(); for (; unknownfs_it != fsEncoderMap[-1].end(); ++unknownfs_it) fsEncoderMap[fsit->fsID].push_back(*unknownfs_it); @@ -252,10 +252,10 @@ void AutoExpire::CalcParams() * \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 expirable 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,7 +271,7 @@ void AutoExpire::RunExpirer(void) while (expire_thread_running) { curTime = QDateTime::currentDateTime(); - // recalculate auto expire parametes + // recalculate auto expire parameters if (curTime >= next_expire) CalcParams(); @@ -454,7 +454,7 @@ void AutoExpire::ExpireRecordings(void) } VERBOSE(VB_FILE, - " Searching for expireable files in these directories"); + " Searching for files expirable in these directories"); QString myHostName = gContext->GetHostName(); pginfolist_t::iterator it = expireList.begin(); while ((it != expireList.end()) && @@ -516,7 +516,7 @@ void AutoExpire::ExpireRecordings(void) fsit->freeSpaceKB += (p->filesize / 1024); deleteList.push_back(p); - VERBOSE(VB_FILE, QString(" FOUND Expireable file. " + VERBOSE(VB_FILE, QString(" FOUND file expirable. " "%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,21 +856,21 @@ void AutoExpire::FillDBOrdered(pginfolist_t &expireList, int expMethod) { default: case emOldestFirst: - msg = "Adding expirable programs in Oldest First order"; + msg = "Adding programs expirable 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 expirable 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 expirable in Weighted Time Priority order"; where = "autoexpire > 0"; if (gContext->GetNumSetting("AutoExpireWatchedPriority", 0)) orderby = "recorded.watched DESC, "; diff --git a/mythtv/programs/mythbackend/encoderlink.cpp b/mythtv/programs/mythbackend/encoderlink.cpp index b1b99fb..1786467 100644 --- a/mythtv/programs/mythbackend/encoderlink.cpp +++ b/mythtv/programs/mythbackend/encoderlink.cpp @@ -24,7 +24,7 @@ using namespace std; * \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,8 +539,8 @@ void EncoderLink::CancelNextRecording(bool cancel) * * \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) */ diff --git a/mythtv/programs/mythbackend/main.cpp b/mythtv/programs/mythbackend/main.cpp index e2f4711..79254da 100644 --- a/mythtv/programs/mythbackend/main.cpp +++ b/mythtv/programs/mythbackend/main.cpp @@ -705,8 +705,8 @@ int main(int argc, char **argv) (chanid.isEmpty() || starttime.isEmpty()) && infile.isEmpty()) { cerr << "--generate-preview must be accompanied by either " <::Iterator iter = encoderList->begin(); @@ -3487,7 +3487,7 @@ void MainServer::HandleCommBreakQuery(const QString &chanid, { // Commercial break query // Format: QUERY_COMMBREAK -// 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,7 +3502,7 @@ void MainServer::HandleCutlistQuery(const QString &chanid, { // Cutlist query // Format: QUERY_CUTLIST -// 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,7 +3517,7 @@ void MainServer::HandleBookmarkQuery(const QString &chanid, PlaybackSock *pbs) // Bookmark query // Format: QUERY_BOOKMARK -// 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,7 +3549,7 @@ void MainServer::HandleSetBookmark(QStringList &tokens, { // Bookmark query // Format: SET_BOOKMARK -// 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. diff --git a/mythtv/programs/mythbackend/mythxml.cpp b/mythtv/programs/mythbackend/mythxml.cpp index 25fa115..adb90d4 100644 --- a/mythtv/programs/mythbackend/mythxml.cpp +++ b/mythtv/programs/mythbackend/mythxml.cpp @@ -599,7 +599,7 @@ void MythXML::GetProgramGuide( HTTPRequest *pRequest ) sCurChanId = pInfo->chanid; - // Ouput new Channel Node + // Output new Channel Node channel = doc.createElement( "Channel" ); channels.appendChild( channel ); diff --git a/mythtv/programs/mythbackend/scheduler.cpp b/mythtv/programs/mythbackend/scheduler.cpp index 5233f0b..34d2aff 100644 --- a/mythtv/programs/mythbackend/scheduler.cpp +++ b/mythtv/programs/mythbackend/scheduler.cpp @@ -2939,7 +2939,7 @@ void Scheduler::AddNewRecords(void) 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 diff --git a/mythtv/programs/mythbackend/upnpcdsmusic.cpp b/mythtv/programs/mythbackend/upnpcdsmusic.cpp index b954b07..389af4d 100644 --- a/mythtv/programs/mythbackend/upnpcdsmusic.cpp +++ b/mythtv/programs/mythbackend/upnpcdsmusic.cpp @@ -1,7 +1,7 @@ ////////////////////////////////////////////////////////////////////////////// // 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: diff --git a/mythtv/programs/mythbackend/upnpcdstv.cpp b/mythtv/programs/mythbackend/upnpcdstv.cpp index eede56f..1f42571 100644 --- a/mythtv/programs/mythbackend/upnpcdstv.cpp +++ b/mythtv/programs/mythbackend/upnpcdstv.cpp @@ -1,7 +1,7 @@ ////////////////////////////////////////////////////////////////////////////// // 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: diff --git a/mythtv/programs/mythbackend/upnpcdsvideo.cpp b/mythtv/programs/mythbackend/upnpcdsvideo.cpp index dfa7f73..b416d92 100644 --- a/mythtv/programs/mythbackend/upnpcdsvideo.cpp +++ b/mythtv/programs/mythbackend/upnpcdsvideo.cpp @@ -1,6 +1,6 @@ // Program Name: upnpcdsvideo.cpp // -// Purpose - uPnp Content Directory Extention for MythVideo Videos +// Purpose - uPnp Content Directory Extension for MythVideo Videos // //////////////////////////////////////////////////////////////////////////////