Skip to content

Commit

Permalink
Merge pull request #171 from stweil/master
Browse files Browse the repository at this point in the history
Fix typos in comments and strings
  • Loading branch information
Lars Op den Kamp committed Jan 20, 2016
2 parents bb09230 + 1f8a185 commit 6d68d21
Show file tree
Hide file tree
Showing 16 changed files with 59 additions and 59 deletions.
2 changes: 1 addition & 1 deletion Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ TYPEDEF_HIDES_STRUCT = NO
# causing a significant performance penality.
# If the system has enough physical memory increasing the cache will improve the
# performance by keeping more symbols in memory. Note that the value works on
# a logarithmic scale so increasing the size by one will rougly double the
# a logarithmic scale so increasing the size by one will roughly double the
# memory usage. The cache size is given by this formula:
# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
# corresponding to a cache size of 2^16 = 65536 symbols
Expand Down
18 changes: 9 additions & 9 deletions debian/changelog.in
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@ libcec (1.8.2-1) unstable; urgency=low
* ensure that the vendor commands are always sent for panasonic, and that
the deck status for lg isn't reset. fixes some buttons not working after
a second or delayed source switch
* added guard so ReplaceHandler() doesn't accidently try to replace a
* added guard so ReplaceHandler() doesn't accidentally try to replace a
handler for the broadcast address
* wait until the commandhandler is replaced before registering a client,
so we don't register a client and replace it directly afterwards if the
Expand Down Expand Up @@ -564,7 +564,7 @@ libcec (1.8.1-1) unstable; urgency=low
* disallow sending CEC_OPCODE_SET_STREAM_PATH - not allowed by the CEC spec
* persist the configuration in the eeprom after initialising the client.
fixes wrong/old settings being used in autonomous mode, which broke the
wake on cec funtion
wake on cec function
* persist the new configuration when the hdmi port setting changed
* cleaned locks around callbacks
* always set controlled mode to false when unregistering the last client.
Expand Down Expand Up @@ -618,7 +618,7 @@ libcec (1.7.2-1) unstable; urgency=low
* panasonic: mark the tv as powered up once it sends the audiomode request
* set the physical address of each device controlled by a CCECClient if
it's valid
* Windows could get stuck in a loop in case there an error occured while
* Windows could get stuck in a loop in case there an error occurred while
reading registry entries
* ABI fixes (binary compat with v1.2 for Windows and v1.5.2 for others)
* replace the handler directly after getting the vendor id of a device when
Expand Down Expand Up @@ -860,7 +860,7 @@ libcec (1.6-1) unstable; urgency=medium
* added bShutdownOnStandby to libcec_configuration. bugzid: 660. This
setting tells the client to shutdown when the TV switches off and is
complimentary to bPowerOffOnStandby, which tells the PC to suspend.
They are kept separate to maintain backwards compatability.
They are kept separate to maintain backwards compatibility.

* fixed
* gcc 4.7 compilation
Expand Down Expand Up @@ -1164,7 +1164,7 @@ libcec (1.4-4) unstable; urgency=low
* close and delete the connection when the processor thread ends. fixes
reconnect after standby (access denied / connection already opened)
* don't replace handlers when not initialised, or the primary device's
logical addres isn't known yet, which can lead to crashes. don't call
logical address isn't known yet, which can lead to crashes. don't call
handlers directly in CCECProcessor without holding a lock on them
* fixed possible crash when command handler were switched while it was
being used
Expand Down Expand Up @@ -1513,8 +1513,8 @@ libcec (0.8-1) unstable; urgency=low
* fixed:
* set the correct ackmask on startup
* wait for ack while keeping a lock
* wait for the processor thread to start before continueing on startup
* wait for messages to be transmitted before continueing in
* wait for the processor thread to start before continuing on startup
* wait for messages to be transmitted before continuing in
CCECProcessor::Transmit()
* only set the logical address once when it has changed
* correct source for broadcast messages
Expand Down Expand Up @@ -1600,7 +1600,7 @@ libcec (0.6-1) unstable; urgency=low
libcec (0.5-1) unstable; urgency=low

* bumped interface version to 5
* don't pass std::string and std::vector accross the interface
* don't pass std::string and std::vector across the interface
* fixed heap corruption crashes on windows
* fixed some memory leaks
* reset all structs to default values before doing with them
Expand All @@ -1625,7 +1625,7 @@ libcec (0.4-2) unstable; urgency=low
* fix segfault on exit
* renamed libPlatform -> platform.
* stuck everything from libCEC in the CEC namespace to avoid namespace
polution
pollution

-- Pulse-Eight Packaging <[email protected]> Tue, 04 Oct 2011 23:45:00 +0200

Expand Down
16 changes: 8 additions & 8 deletions include/cec.h
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,13 @@ namespace CEC
* @param deviceList The vector to store device descriptors in.
* @param iBufSize The size of the deviceList buffer.
* @param strDevicePath Optional device path. Only adds device descriptors that match the given device path.
* @return The number of devices that were found, or -1 when an error occured.
* @return The number of devices that were found, or -1 when an error occurred.
*/
virtual int8_t FindAdapters(cec_adapter *deviceList, uint8_t iBufSize, const char *strDevicePath = NULL) = 0;

/*!
* @brief Sends a ping command to the adapter, to check if it's responding.
* @return True when the ping was succesful, false otherwise.
* @return True when the ping was successful, false otherwise.
*/
virtual bool PingAdapter(void) = 0;

Expand Down Expand Up @@ -117,21 +117,21 @@ namespace CEC
/*!
* @brief Power on the given CEC capable devices. If CECDEVICE_BROADCAST is used, then wakeDevice in libcec_configuration will be used.
* @param address The logical address to power on.
* @return True when the command was sent succesfully, false otherwise.
* @return True when the command was sent successfully, false otherwise.
*/
virtual bool PowerOnDevices(cec_logical_address address = CECDEVICE_TV) = 0;

/*!
* @brief Put the given CEC capable devices in standby mode. If CECDEVICE_BROADCAST is used, then standbyDevices in libcec_configuration will be used.
* @brief address The logical address of the device to put in standby.
* @return True when the command was sent succesfully, false otherwise.
* @return True when the command was sent successfully, false otherwise.
*/
virtual bool StandbyDevices(cec_logical_address address = CECDEVICE_BROADCAST) = 0;

/*!
* @brief Change the active source to a device type handled by libCEC. Use CEC_DEVICE_TYPE_RESERVED to make the default type used by libCEC active.
* @param type The new active source. Leave empty to use the primary type
* @return True when the command was sent succesfully, false otherwise.
* @return True when the command was sent successfully, false otherwise.
*/
virtual bool SetActiveSource(cec_device_type type = CEC_DEVICE_TYPE_RESERVED) = 0;

Expand All @@ -153,7 +153,7 @@ namespace CEC

/*!
* @brief Broadcast a message that notifies connected CEC capable devices that this device is no longer the active source.
* @return True when the command was sent succesfully, false otherwise.
* @return True when the command was sent successfully, false otherwise.
*/
virtual bool SetInactiveView(void) = 0;

Expand Down Expand Up @@ -192,7 +192,7 @@ namespace CEC
* @brief Get the menu language of the device with the given logical address
* @param iLogicalAddress The logical address of the device to get the menu language for.
* @param language The requested menu language.
* @return True when fetched succesfully, false otherwise.
* @return True when fetched successfully, false otherwise.
*/
virtual bool GetDeviceMenuLanguage(cec_logical_address iLogicalAddress, cec_menu_language *language) = 0;

Expand Down Expand Up @@ -455,7 +455,7 @@ namespace CEC
* @param iBufSize The size of the deviceList buffer.
* @param strDevicePath Optional device path. Only adds device descriptors that match the given device path.
* @param bQuickScan True to do a "quick scan", which will not open a connection to the adapter. Firmware version information and the exact device type will be missing
* @return The number of devices that were found, or -1 when an error occured.
* @return The number of devices that were found, or -1 when an error occurred.
*/
virtual int8_t DetectAdapters(cec_adapter_descriptor *deviceList, uint8_t iBufSize, const char *strDevicePath = NULL, bool bQuickScan = false) = 0;

Expand Down
4 changes: 2 additions & 2 deletions include/cectypes.h
Original file line number Diff line number Diff line change
Expand Up @@ -1080,7 +1080,7 @@ typedef struct cec_command
* @brief Formats a cec_command.
* @param command The command to format.
* @param initiator The logical address of the initiator.
* @param destination The logical addres of the destination.
* @param destination The logical address of the destination.
* @param opcode The opcode of the command.
* @param timeout The transmission timeout.
*/
Expand Down Expand Up @@ -1490,7 +1490,7 @@ struct libcec_configuration
uint8_t bMonitorOnly; /*!< won't allocate a CCECClient when starting the connection when set (same as monitor mode). added in 1.6.3 */
cec_version cecVersion; /*!< CEC spec version to use by libCEC. defaults to v1.4. added in 1.8.0 */
cec_adapter_type adapterType; /*!< type of the CEC adapter that we're connected to. added in 1.8.2 */
uint8_t iDoubleTapTimeout50Ms; /*!< prevent double taps withing this timeout, in units of 50ms. defaults to 200ms (value: 4). added in 2.0.0,
uint8_t iDoubleTapTimeout50Ms; /*!< prevent double taps within this timeout, in units of 50ms. defaults to 200ms (value: 4). added in 2.0.0,
XXX changed meaning in 2.2.0 to not break binary compatibility. next major (3.0) release will fix it in a nicer way */
cec_user_control_code comboKey; /*!< key code that initiates combo keys. defaults to CEC_USER_CONTROL_CODE_F1_BLUE. CEC_USER_CONTROL_CODE_UNKNOWN to disable. added in 2.0.5 */
uint32_t iComboKeyTimeoutMs; /*!< timeout until the combo key is sent as normal keypress */
Expand Down
2 changes: 1 addition & 1 deletion src/LibCecSharp/CecSharpTypes.h
Original file line number Diff line number Diff line change
Expand Up @@ -828,7 +828,7 @@ namespace CecSharp
/// </summary>
VolumeStatusMask = 0x7F,
/// <summary>
/// Minumum volume
/// Minimum volume
/// </summary>
VolumeMin = 0x00,
/// <summary>
Expand Down
10 changes: 5 additions & 5 deletions src/LibCecSharp/LibCecSharp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ namespace CecSharp
/// <summary>
/// Sends a ping command to the adapter, to check if it's responding.
/// </summary>
/// <returns>True when the ping was succesful, false otherwise</returns>
/// <returns>True when the ping was successful, false otherwise</returns>
bool PingAdapter(void)
{
return m_libCec->PingAdapter();
Expand Down Expand Up @@ -204,7 +204,7 @@ namespace CecSharp
/// Power on the given CEC capable devices. If CECDEVICE_BROADCAST is used, then wakeDevice in libcec_configuration will be used.
/// </summary>
/// <param name="logicalAddress">The logical address to power on.</param>
/// <returns>True when the command was sent succesfully, false otherwise.</returns>
/// <returns>True when the command was sent successfully, false otherwise.</returns>
bool PowerOnDevices(CecLogicalAddress logicalAddress)
{
return m_libCec->PowerOnDevices((cec_logical_address) logicalAddress);
Expand All @@ -214,7 +214,7 @@ namespace CecSharp
/// Put the given CEC capable devices in standby mode. If CECDEVICE_BROADCAST is used, then standbyDevices in libcec_configuration will be used.
/// </summary>
/// <param name="logicalAddress">The logical address of the device to put in standby.</param>
/// <returns>True when the command was sent succesfully, false otherwise.</returns>
/// <returns>True when the command was sent successfully, false otherwise.</returns>
bool StandbyDevices(CecLogicalAddress logicalAddress)
{
return m_libCec->StandbyDevices((cec_logical_address) logicalAddress);
Expand All @@ -234,7 +234,7 @@ namespace CecSharp
/// Change the active source to a device type handled by libCEC. Use CEC_DEVICE_TYPE_RESERVED to make the default type used by libCEC active.
/// </summary>
/// <param name="type">The new active source. Use CEC_DEVICE_TYPE_RESERVED to use the primary type</param>
/// <returns>True when the command was sent succesfully, false otherwise.</returns>
/// <returns>True when the command was sent successfully, false otherwise.</returns>
bool SetActiveSource(CecDeviceType type)
{
return m_libCec->SetActiveSource((cec_device_type) type);
Expand Down Expand Up @@ -265,7 +265,7 @@ namespace CecSharp
/// <summary>
/// Broadcast a message that notifies connected CEC capable devices that this device is no longer the active source.
/// </summary>
/// <returns>True when the command was sent succesfully, false otherwise.</returns>
/// <returns>True when the command was sent successfully, false otherwise.</returns>
bool SetInactiveView(void)
{
return m_libCec->SetInactiveView();
Expand Down
2 changes: 1 addition & 1 deletion src/cec-client/cec-client.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ void ShowHelpCommandLine(const char* strExec)
" -l --list-devices List all devices on this system" << std::endl <<
" -t --type {p|r|t|a} The device type to use. More than one is possible." << std::endl <<
" -p --port {int} The HDMI port to use as active source." << std::endl <<
" -b --base {int} The logical address of the device to with this " << std::endl <<
" -b --base {int} The logical address of the device to which this " << std::endl <<
" adapter is connected." << std::endl <<
" -f --log-file {file} Writes all libCEC log message to a file" << std::endl <<
" -r --rom Read persisted settings from the EEPROM" << std::endl <<
Expand Down
Loading

0 comments on commit 6d68d21

Please sign in to comment.