Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/ExMplayer.pro
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,14 @@ FORMS += searchsubtitle/searchsubtitle.ui \
coverartdialog.ui \
gifanimatordialog.ui

#miniz libarary to uncompress data
#miniz library to uncompress data
SOURCES += searchsubtitle/miniz/miniz.c searchsubtitle/miniz/tinfl.c

# xmlrpc client code to connect to opensubtitles.org
HEADERS +=searchsubtitle/maia/maiaObject.h searchsubtitle/maia/maiaFault.h searchsubtitle/maia/maiaXmlRpcClient.h
SOURCES += searchsubtitle/maia/maiaObject.cpp searchsubtitle/maia/maiaFault.cpp searchsubtitle/maia/maiaXmlRpcClient.cpp

#video dl suppport
#video dl support
INCLUDEPATH += videodl
DEPENDPATH += videodl

Expand Down
2 changes: 1 addition & 1 deletion src/pictureflow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -635,7 +635,7 @@ static QImage* prepareSurface(const QImage* slideImage, int w, int h, QRgb bgcol
QImage img = slideImage->smoothScale(w, h);
#endif

// slightly larger, to accomodate for the reflection
// slightly larger, to accommodate for the reflection
int hs = h * 2;
int hofs = h / 3;

Expand Down
2 changes: 1 addition & 1 deletion src/playerwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4110,7 +4110,7 @@ void PlayerWindow::saveCoverArt()
if (!fileName.isEmpty())
{
if(!cover->save(fileName,0,-1))
QMessageBox::critical(this,qApp->applicationName(),tr("An error occured while saving"),QMessageBox::Ok,QMessageBox::Cancel);
QMessageBox::critical(this,qApp->applicationName(),tr("An error occurred while saving"),QMessageBox::Ok,QMessageBox::Cancel);

}
}
Expand Down
2 changes: 1 addition & 1 deletion src/preferencedialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ void preferenceDialog::on_buttonBox_clicked(QAbstractButton* button)
QString actHash="c8ba9d01342f8488c815fb5e63e96f53ba9f46fb";*/
// if ( QString(hashData.toHex())!=actHash)
//{
// qDebug() << "Differnt font config";
// qDebug() << "Different font config";
if (ui->checkBoxUseCodePage->isChecked())
{QString exeFileName(qApp->applicationDirPath()+"/exmplayer-font-cache.exe");

Expand Down
4 changes: 2 additions & 2 deletions src/qtsingleapplication/qtlockedfile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,8 @@ QtLockedFile::LockMode QtLockedFile::lockMode() const
can be locked.

If \a block is true, this function will block until the lock is
aquired. If \a block is false, this function returns \e false
immediately if the lock cannot be aquired.
acquired. If \a block is false, this function returns \e false
immediately if the lock cannot be acquired.

If this object already has a lock of type \a mode, this function
returns \e true immediately. If this object has a lock of a
Expand Down
2 changes: 1 addition & 1 deletion src/screensaver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ void WinScreenSaver::retrieveState() {
qDebug("WinScreenSaver::retrieveState: lowpower: %d, poweroff: %d, screensaver: %d", lowpower, poweroff, screensaver);
#else
state_saved = true;
qDebug("WinScreensaver::retrieveState: init done %s", SSCore_TempDisable ?"succesfully":"failed");
qDebug("WinScreensaver::retrieveState: init done %s", SSCore_TempDisable ?"successfully":"failed");
#endif
} else {
qDebug("WinScreenSaver::retrieveState: state already saved previously, doing nothing");
Expand Down
2 changes: 1 addition & 1 deletion src/searchsubtitle/maia/maiaXmlRpcServerConnection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ void MaiaXmlRpcServerConnection::parseCall(QString call) {
QObject *responseObject;
const char *responseSlot;

if(!doc.setContent(call)) { /* recieved invalid xml */
if(!doc.setContent(call)) { /* received invalid xml */
MaiaFault fault(-32700, "parse error: not well formed");
sendResponse(fault.toString());
return;
Expand Down
2 changes: 1 addition & 1 deletion src/searchsubtitle/miniz/miniz.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* Change History
10/13/13 v1.15 r4 - Interim bugfix release while I work on the next major release with Zip64 support (almost there!):
- Critical fix for the MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY bug (thanks kahmyong.moon@hp.com) which could cause locate files to not find files. This bug
would only have occured in earlier versions if you explicitly used this flag, OR if you used mz_zip_extract_archive_file_to_heap() or mz_zip_add_mem_to_archive_file_in_place()
would only have occurred in earlier versions if you explicitly used this flag, OR if you used mz_zip_extract_archive_file_to_heap() or mz_zip_add_mem_to_archive_file_in_place()
(which used this flag). If you can't switch to v1.15 but want to fix this bug, just remove the uses of this flag from both helper funcs (and of course don't use the flag).
- Bugfix in mz_zip_reader_extract_to_mem_no_alloc() from kymoon when pUser_read_buf is not NULL and compressed size is > uncompressed size
- Fixing mz_zip_reader_extract_*() funcs so they don't try to extract compressed data from directory entries, to account for weird zipfiles which contain zero-size compressed data on dir entries.
Expand Down
2 changes: 1 addition & 1 deletion src/searchsubtitle/opensubtitleclient.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ void OpenSubtitlesClient::handleLogin(QVariant& result)

if (resultMap["status"].toString() == QLatin1String("200 OK")) {
token = resultMap["token"].toString();
qDebug()<<"Login succesful"<<resultMap["status"].toString();
qDebug()<<"Login successful"<<resultMap["status"].toString();
emit readyForSearch();
// XXX
//search("F:/films/Despicable Me 2 (2013)/Despicable.Me.2.2013.720p.BluRay.x264.YIFY.mp4",FILEHASH);
Expand Down
6 changes: 3 additions & 3 deletions src/taglib/id3v2frame.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ namespace TagLib {
* split between a collection of frames (which are in turn split into fields
* (Structure, <a href="id3v2-structure.html#4">4</a>)
* (<a href="id3v2-frames.html">Frames</a>). This class provides an API for
* gathering information about and modifying ID3v2 frames. Funtionallity
* gathering information about and modifying ID3v2 frames. Functionality
* specific to a given frame type is handed in one of the many subclasses.
*/

Expand Down Expand Up @@ -165,7 +165,7 @@ namespace TagLib {
* All other processing of \a data should be handled in a subclass.
*
* \note This need not contain anything more than a frame ID, but
* \e must constain at least that.
* \e must contain at least that.
*/
explicit Frame(const ByteVector &data);

Expand Down Expand Up @@ -255,7 +255,7 @@ namespace TagLib {


/*!
* Parses the contents of this frame as PropertyMap. If that fails, the returend
* Parses the contents of this frame as PropertyMap. If that fails, the returned
* PropertyMap will be empty, and its unsupportedData() will contain this frame's
* ID.
* BIC: Will be a virtual function in future releases.
Expand Down