Ticket #5692: programs_mythbackend-spelling-typos-ticket-5692.patch

File programs_mythbackend-spelling-typos-ticket-5692.patch, 14.2 KB (added by Erik Hovland <erik@…>, 12 years ago)

Uses expirable, but otherwise the same patch

  • mythtv/programs/mythbackend/autoexpire.cpp

    Fixes any spelling or typos found in the comments
    
    From: Erik Hovland <erik@hovland.org>
    
    
    ---
    
     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 b size_t AutoExpire::GetDesiredSpace(int fsID) const 
    117117}
    118118
    119119/** \fn AutoExpire::CalcParams()
    120  *   Calcualtes how much space needs to be cleared, and how often.
     120 *   Calculates how much space needs to be cleared, and how often.
    121121 */
    122122void AutoExpire::CalcParams()
    123123{
    void AutoExpire::CalcParams() 
    145145
    146146    // we use this copying on purpose. The used_encoders map ensures
    147147    // that every encoder writes only to one fs.
    148     // Copying the data minizes the time the lock is held
     148    // Copying the data minimizes the time the lock is held
    149149    instance_lock.lock();
    150150    QMap<int, int>::const_iterator ueit = used_encoders.begin();
    151151    while (ueit != used_encoders.end())
    void AutoExpire::CalcParams() 
    164164        fsMap[fsit->fsID] = 0;
    165165        size_t thisKBperMin = 0;
    166166
    167         // append unkown recordings to all fsIDs
     167        // append unknown recordings to all fsIDs
    168168        vector<int>::iterator unknownfs_it = fsEncoderMap[-1].begin();
    169169        for (; unknownfs_it != fsEncoderMap[-1].end(); ++unknownfs_it)
    170170            fsEncoderMap[fsit->fsID].push_back(*unknownfs_it);
    void AutoExpire::CalcParams() 
    252252 *  \brief This contains the main loop for the auto expire process.
    253253 *
    254254 *   Responsible for cleanup of old LiveTV programs as well as deleting as
    255  *   many expireable recordings as necessary to maintain enough free space
    256  *   on all directories in MythTV Storage Groups.  The thread deletes short
    257  *   LiveTV programs every 2 minutes and long LiveTV and regular programs
    258  *   as needed every "desired_freq" minutes.
     255 *   many recordings that are expirable as necessary to
     256 *   maintain enough free space on all directories in MythTV Storage Groups.
     257 *   The thread deletes short LiveTV programs every 2 minutes and long
     258 *   LiveTV and regular programs as needed every "desired_freq" minutes.
    259259 */
    260260void AutoExpire::RunExpirer(void)
    261261{
    void AutoExpire::RunExpirer(void) 
    271271    while (expire_thread_running)
    272272    {
    273273        curTime = QDateTime::currentDateTime();
    274         // recalculate auto expire parametes
     274        // recalculate auto expire parameters
    275275        if (curTime >= next_expire)
    276276            CalcParams();
    277277
    void AutoExpire::ExpireRecordings(void) 
    454454            }
    455455
    456456            VERBOSE(VB_FILE,
    457                     "    Searching for expireable files in these directories");
     457                    "    Searching for files expirable in these directories");
    458458            QString myHostName = gContext->GetHostName();
    459459            pginfolist_t::iterator it = expireList.begin();
    460460            while ((it != expireList.end()) &&
    void AutoExpire::ExpireRecordings(void) 
    516516                    fsit->freeSpaceKB += (p->filesize / 1024);
    517517                    deleteList.push_back(p);
    518518
    519                     VERBOSE(VB_FILE, QString("        FOUND Expireable file. "
     519                    VERBOSE(VB_FILE, QString("        FOUND file expirable. "
    520520                            "%1 @ %2 is located at %3 which is on fsID #%4. "
    521521                            "Adding to deleteList.  After deleting we should "
    522522                            "have %5 MB free on this filesystem.")
    void AutoExpire::FillDBOrdered(pginfolist_t &expireList, int expMethod) 
    856856    {
    857857        default:
    858858        case emOldestFirst:
    859             msg = "Adding expirable programs in Oldest First order";
     859            msg = "Adding programs expirable in Oldest First order";
    860860            where = "autoexpire > 0";
    861861            if (gContext->GetNumSetting("AutoExpireWatchedPriority", 0))
    862862                orderby = "recorded.watched DESC, ";
    863863            orderby += "starttime ASC";
    864864            break;
    865865        case emLowestPriorityFirst:
    866             msg = "Adding expirable programs in Lowest Priority First order";
     866            msg = "Adding programs expirable in Lowest Priority First order";
    867867            where = "autoexpire > 0";
    868868            if (gContext->GetNumSetting("AutoExpireWatchedPriority", 0))
    869869                orderby = "recorded.watched DESC, ";
    870870            orderby += "recorded.recpriority ASC, starttime ASC";
    871871            break;
    872872        case emWeightedTimePriority:
    873             msg = "Adding expirable programs in Weighted Time Priority order";
     873            msg = "Adding programs expirable in Weighted Time Priority order";
    874874            where = "autoexpire > 0";
    875875            if (gContext->GetNumSetting("AutoExpireWatchedPriority", 0))
    876876                orderby = "recorded.watched DESC, ";
  • mythtv/programs/mythbackend/encoderlink.cpp

    diff --git a/mythtv/programs/mythbackend/encoderlink.cpp b/mythtv/programs/mythbackend/encoderlink.cpp
    index b1b99fb..1786467 100644
    a b using namespace std; 
    2424 * \class EncoderLink
    2525 * \brief Provides an interface to both local and remote TVRec's for the mythbackend.
    2626 *
    27  *  This class be instanciated for either a local or remote TVRec's.
     27 *  This class be instantiated for either a local or remote TVRec's.
    2828 *  Many of the methods will work with either, but many only work for
    2929 *  a local TVRec's and these are labeled appropriately in this document.
    3030 *
    void EncoderLink::CancelNextRecording(bool cancel) 
    539539 *
    540540 *  \param chain The LiveTV chain to use
    541541 *  \param startchan The channel the LiveTV should start with
    542  *  \param pip Tells TVRec's RingBuffer that this is for a Picture in Picture di
    543 splay.
     542 *  \param pip Tells TVRec's RingBuffer that this is for a Picture in Picture
     543 *  display.
    544544 *  \sa TVRec::SpawnLiveTV(LiveTVChain*,bool,QString),
    545545 *      RemoteEncoder::SpawnLiveTV(QString,bool,QString)
    546546 */
  • mythtv/programs/mythbackend/main.cpp

    diff --git a/mythtv/programs/mythbackend/main.cpp b/mythtv/programs/mythbackend/main.cpp
    index e2f4711..79254da 100644
    a b int main(int argc, char **argv) 
    705705        (chanid.isEmpty() || starttime.isEmpty()) && infile.isEmpty())
    706706    {
    707707        cerr << "--generate-preview must be accompanied by either " <<endl
    708              << "\nboth --chanid and --starttime paramaters, " << endl
    709              << "\nor the --infile paramater." << endl;
     708             << "\nboth --chanid and --starttime parameters, " << endl
     709             << "\nor the --infile parameter." << endl;
    710710        return BACKEND_EXIT_INVALID_CMDLINE;
    711711    }
    712712
  • mythtv/programs/mythbackend/mainserver.cpp

    diff --git a/mythtv/programs/mythbackend/mainserver.cpp b/mythtv/programs/mythbackend/mainserver.cpp
    index a4f1fc7..62ca28d 100644
    a b void MainServer::ProcessRequestWork(MythSocket *sock) 
    608608            }
    609609            else
    610610                VERBOSE(VB_IMPORTANT,
    611                         "WARNING: Recieved an empty SHUTDOWN_NOW query!");
     611                        "WARNING: Received an empty SHUTDOWN_NOW query!");
    612612        }
    613613    }
    614614    else if (command == "BACKEND_MESSAGE")
    void *MainServer::SpawnDeleteThread(void *param) 
    15001500void MainServer::DoDeleteThread(const DeleteStruct *ds)
    15011501{
    15021502    // sleep a little to let frontends reload the recordings list
    1503     // after deleteing a recording, then we can hammer the DB and filesystem
     1503    // after deleting a recording, then we can hammer the DB and filesystem
    15041504    sleep(3);
    15051505    usleep(rand()%2000);
    15061506
    int MainServer::OpenAndUnlink(const QString &filename) 
    18031803 *
    18041804 *   When the file is small enough this closes the file and returns.
    18051805 *
    1806  *   NOTE: This aquires a lock so that only one instance of TruncateAndClose()
     1806 *   NOTE: This acquires a lock so that only one instance of TruncateAndClose()
    18071807 *         is running at a time.
    18081808 */
    18091809bool MainServer::TruncateAndClose(ProgramInfo *pginfo, int fd,
    void MainServer::DoHandleDeleteRecording(ProgramInfo *pginfo, PlaybackSock *pbs, 
    20982098        }
    20992099    }
    21002100
    2101     // Tell all encoders to stop recordering to the file being deleted.
     2101    // Tell all encoders to stop recording to the file being deleted.
    21022102    // Hopefully this is never triggered.
    21032103
    21042104    QMap<int, EncoderLink *>::Iterator iter = encoderList->begin();
    void MainServer::HandleCommBreakQuery(const QString &chanid, 
    34873487{
    34883488// Commercial break query
    34893489// Format:  QUERY_COMMBREAK <chanid> <starttime>
    3490 // chanid is chanid, starttime is startime of prorgram in
     3490// chanid is chanid, starttime is startime of program in
    34913491//   # of seconds since Jan 1, 1970, in UTC time.  Same format as in
    34923492//   a ProgramInfo structure in a string list.
    34933493// Return structure is [number of rows] followed by a triplet of values:
    void MainServer::HandleCutlistQuery(const QString &chanid, 
    35023502{
    35033503// Cutlist query
    35043504// Format:  QUERY_CUTLIST <chanid> <starttime>
    3505 // chanid is chanid, starttime is startime of prorgram in
     3505// chanid is chanid, starttime is startime of program in
    35063506//   # of seconds since Jan 1, 1970, in UTC time.  Same format as in
    35073507//   a ProgramInfo structure in a string list.
    35083508// Return structure is [number of rows] followed by a triplet of values:
    void MainServer::HandleBookmarkQuery(const QString &chanid, 
    35173517                                     PlaybackSock *pbs)
    35183518// Bookmark query
    35193519// Format:  QUERY_BOOKMARK <chanid> <starttime>
    3520 // chanid is chanid, starttime is startime of prorgram in
     3520// chanid is chanid, starttime is startime of program in
    35213521//   # of seconds since Jan 1, 1970, in UTC time.  Same format as in
    35223522//   a ProgramInfo structure in a string list.
    35233523// Return value is a long-long encoded as two separate values
    void MainServer::HandleSetBookmark(QStringList &tokens, 
    35493549{
    35503550// Bookmark query
    35513551// Format:  SET_BOOKMARK <chanid> <starttime> <long part1> <long part2>
    3552 // chanid is chanid, starttime is startime of prorgram in
     3552// chanid is chanid, starttime is startime of program in
    35533553//   # of seconds since Jan 1, 1970, in UTC time.  Same format as in
    35543554//   a ProgramInfo structure in a string list.  The two longs are the two
    35553555//   portions of the bookmark value to set.
  • mythtv/programs/mythbackend/mythxml.cpp

    diff --git a/mythtv/programs/mythbackend/mythxml.cpp b/mythtv/programs/mythbackend/mythxml.cpp
    index 25fa115..adb90d4 100644
    a b void MythXML::GetProgramGuide( HTTPRequest *pRequest ) 
    599599
    600600            sCurChanId = pInfo->chanid;
    601601
    602             // Ouput new Channel Node
     602            // Output new Channel Node
    603603
    604604            channel = doc.createElement( "Channel" );
    605605            channels.appendChild( channel );
  • mythtv/programs/mythbackend/scheduler.cpp

    diff --git a/mythtv/programs/mythbackend/scheduler.cpp b/mythtv/programs/mythbackend/scheduler.cpp
    index 5233f0b..34d2aff 100644
    a b void Scheduler::AddNewRecords(void) 
    29392939        p->schedulerid =
    29402940            p->startts.toString() + "_" + p->chanid;
    29412941
    2942         // Chedk to see if the program is currently recording and if
     2942        // Check to see if the program is currently recording and if
    29432943        // the end time was changed.  Ideally, checking for a new end
    29442944        // time should be done after PruneOverlaps, but that would
    29452945        // complicate the list handling.  Do it here unless it becomes
  • mythtv/programs/mythbackend/upnpcdsmusic.cpp

    diff --git a/mythtv/programs/mythbackend/upnpcdsmusic.cpp b/mythtv/programs/mythbackend/upnpcdsmusic.cpp
    index b954b07..389af4d 100644
    a b  
    11//////////////////////////////////////////////////////////////////////////////
    22// Program Name: upnpcdsmusic.cpp
    33//                                                                           
    4 // Purpose - uPnp Content Directory Extention for Music 
     4// Purpose - uPnp Content Directory Extension for Music 
    55//                                                                           
    66// Created By  : David Blain                    Created On : Jan. 24, 2005
    77// Modified By :                                Modified On:                 
  • mythtv/programs/mythbackend/upnpcdstv.cpp

    diff --git a/mythtv/programs/mythbackend/upnpcdstv.cpp b/mythtv/programs/mythbackend/upnpcdstv.cpp
    index eede56f..1f42571 100644
    a b  
    11//////////////////////////////////////////////////////////////////////////////
    22// Program Name: upnpcdstv.cpp
    33//                                                                           
    4 // Purpose - uPnp Content Directory Extention for Recorded TV 
     4// Purpose - uPnp Content Directory Extension for Recorded TV 
    55//                                                                           
    66// Created By  : David Blain                    Created On : Jan. 24, 2005
    77// Modified By :                                Modified On:                 
  • mythtv/programs/mythbackend/upnpcdsvideo.cpp

    diff --git a/mythtv/programs/mythbackend/upnpcdsvideo.cpp b/mythtv/programs/mythbackend/upnpcdsvideo.cpp
    index dfa7f73..b416d92 100644
    a b  
    11// Program Name: upnpcdsvideo.cpp
    22//                                                                           
    3 // Purpose - uPnp Content Directory Extention for MythVideo Videos
     3// Purpose - uPnp Content Directory Extension for MythVideo Videos
    44//                                                                           
    55//////////////////////////////////////////////////////////////////////////////
    66