Skip to content

Commit

Permalink
fix whitespace
Browse files Browse the repository at this point in the history
* trim excess whitespace
* trim trailing whitespace
* unify indentation
* make sure every line has a ending newline
  • Loading branch information
a1346054 committed Sep 17, 2021
1 parent 6d7e20f commit e321a2a
Show file tree
Hide file tree
Showing 24 changed files with 74 additions and 89 deletions.
2 changes: 1 addition & 1 deletion .lgtm.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
extraction:
cpp:
prepare:
packages:
packages:
- libzen-dev
- libmediainfo-dev
configure:
Expand Down
4 changes: 2 additions & 2 deletions Contrib/TranslationToolkit/Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Tips:

1. After you finish translating, save the translated file as `Language_parsed.csv`.

2. Put the file in this folder, along with the original `Language.csv`.
2. Put the file in this folder, along with the original `Language.csv`.

3. (optional) Open `Convert_Compile.py` with your text editor and edit the configurations.

Expand All @@ -56,7 +56,7 @@ Create a pull request to merge your translated file `Language_translated.csv`. I

The CSV files are Excel-style. You can open them with Microsoft Excel.

- `Data_Comments.csv`: Official comments from `MediaInfoLib` source code. This is used in parsing the language file.
- `Data_Comments.csv`: Official comments from `MediaInfoLib` source code. This is used in parsing the language file.
- `Data_Notes.csv`: Translation notes that I wrote. This includes suggestions, links to reference web pages, etc. This is used in parsing the language file.
- `Data_Levels_Info.md`: Official information about metadata levels, from `MediaInfoLib` source code. This is not used in the scripts. You can check the chart for reference.

Expand Down
1 change: 0 additions & 1 deletion Project/AppImage/Recipe.sh
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ else
exit 1
fi


# Compile MediaInfo
if test -e MediaInfo; then
# CLI
Expand Down
4 changes: 2 additions & 2 deletions Project/Flatpak/net.mediaarea.mediainfo-gui.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"name": "wxwidgets",
"cleanup": [ "/bin", "/include", "/share", "/lib/wx" ],
"config-opts": [ "--enable-shared", "--disable-static", "--enable-monolithic", "--enable-unicode" ],
"sources": [
{ "type": "git", "url": "https://github.com/wxWidgets/wxWidgets", "branch": "v3.0.2" }
"sources": [
{ "type": "git", "url": "https://github.com/wxWidgets/wxWidgets", "branch": "v3.0.2" }
]
},
{
Expand Down
36 changes: 18 additions & 18 deletions Project/GNU/CLI/autogen.sh
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
#libtoolize
if test "$(uname)" = "Darwin" ; then
#Darwin based Systems like Mac OS X: libtoolize is called glibtoolize.
glibtoolize --automake
#libtoolize
if test "$(uname)" = "Darwin"; then
#Darwin based Systems like Mac OS X: libtoolize is called glibtoolize.
glibtoolize --automake
else
libtoolize --automake
libtoolize --automake
fi

#aclocal
if test -e /usr/bin/aclocal-1.11 ; then
#OpenSolaris: no aclocal
aclocal-1.11
elif test -e /usr/bin/aclocal-1.10 ; then
aclocal-1.10
if test -e /usr/bin/aclocal-1.11; then
#OpenSolaris: no aclocal
aclocal-1.11
elif test -e /usr/bin/aclocal-1.10; then
aclocal-1.10
else
aclocal
aclocal
fi

#automake
if test -e /usr/bin/automake-1.11 ; then
#OpenSolaris: no automake
automake-1.11 -a
elif test -e /usr/bin/automake-1.10 ; then
automake-1.10 -a
if test -e /usr/bin/automake-1.11; then
#OpenSolaris: no automake
automake-1.11 -a
elif test -e /usr/bin/automake-1.10; then
automake-1.10 -a
else
automake -a
automake -a
fi

autoreconf -fi
autoreconf -fi
2 changes: 1 addition & 1 deletion Project/GNU/GUI/AddThisToRoot_GUI_compile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Parallel_Make() {
'linux')
numprocs=`grep -c ^processor /proc/cpuinfo 2>/dev/null`
;;
'mac')
'mac')
if type sysctl >/dev/null 2>&1; then
numprocs=`sysctl -n hw.ncpu`
fi
Expand Down
36 changes: 18 additions & 18 deletions Project/GNU/GUI/autogen.sh
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
#libtoolize
if test "$(uname)" = "Darwin" ; then
#Darwin based Systems like Mac OS X: libtoolize is called glibtoolize.
glibtoolize --automake
#libtoolize
if test "$(uname)" = "Darwin"; then
#Darwin based Systems like Mac OS X: libtoolize is called glibtoolize.
glibtoolize --automake
else
libtoolize --automake
libtoolize --automake
fi

#aclocal
if test -e /usr/bin/aclocal-1.11 ; then
#OpenSolaris: no aclocal
aclocal-1.11
elif test -e /usr/bin/aclocal-1.10 ; then
aclocal-1.10
if test -e /usr/bin/aclocal-1.11; then
#OpenSolaris: no aclocal
aclocal-1.11
elif test -e /usr/bin/aclocal-1.10; then
aclocal-1.10
else
aclocal
aclocal
fi

#automake
if test -e /usr/bin/automake-1.11 ; then
#OpenSolaris: no automake
automake-1.11 -a
elif test -e /usr/bin/automake-1.10 ; then
automake-1.10 -a
if test -e /usr/bin/automake-1.11; then
#OpenSolaris: no automake
automake-1.11 -a
elif test -e /usr/bin/automake-1.10; then
automake-1.10 -a
else
automake -a
automake -a
fi

autoreconf -fi
autoreconf -fi
8 changes: 4 additions & 4 deletions Project/GNU/GUI/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -192,17 +192,17 @@ if test "$with_wxwidgets" = "yes"; then
dnl System lib found!
with_wxwidgets="system"
fi

if test "$with_wxwidgets" = "no"; then
AC_MSG_ERROR([
wxWidgets must be installed on your system.
Please check that wx-config is in path, the directory
where wxWidgets libraries are installed (returned by
'wx-config --libs' or 'wx-config --static --libs' command)
is in LD_LIBRARY_PATH or equivalent variable and
wxWidgets version is $WxVersion or above, and the compilation
is compatible with
wxWidgets version is $WxVersion or above, and the compilation
is compatible with
--unicode=$enable_unicode --static=$with_wx_static
])
fi
Expand Down
24 changes: 12 additions & 12 deletions Project/GNU/GUI/mediainfo-gui.kde3.desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[Desktop Entry]
Name=mediainfo-gui.desktop
ServiceTypes=audio/*,video/*,image/*,application/x-flash-video
Actions=mediainfo-gui
X-KDE-Priority=TopLevel
Keywords=media info;metadata;tag;video;audio;subtitles;chapters;codec;mkv;mpeg;mp3;h264;avc;h265;hevc;avi;

[Desktop Action mediainfo-gui]
Name=MediaInfo
GenericName=Media Analyzer
Exec=mediainfo-gui %u
Icon=mediainfo
[Desktop Entry]
Name=mediainfo-gui.desktop
ServiceTypes=audio/*,video/*,image/*,application/x-flash-video
Actions=mediainfo-gui
X-KDE-Priority=TopLevel
Keywords=media info;metadata;tag;video;audio;subtitles;chapters;codec;mkv;mpeg;mp3;h264;avc;h265;hevc;avi;

[Desktop Action mediainfo-gui]
Name=MediaInfo
GenericName=Media Analyzer
Exec=mediainfo-gui %u
Icon=mediainfo
10 changes: 5 additions & 5 deletions Project/GNU/GUI/wxwin.m4
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ dnl AM_PATH_WXRC([HAVE_WXRC=1], [HAVE_WXRC=0])
dnl if test "x$HAVE_WXRC" != x1; then
dnl AC_MSG_ERROR([
dnl The wxrc program was not installed or not found.
dnl
dnl
dnl Please check the wxWidgets installation.
dnl ])
dnl fi
Expand Down Expand Up @@ -338,13 +338,13 @@ dnl
AC_DEFUN([AM_PATH_WXRC],
[
AC_ARG_VAR([WXRC], [Path to wxWidget's wxrc resource compiler])
if test "x$WX_CONFIG_NAME" = x; then
AC_MSG_ERROR([The wxrc tests must run after wxWidgets test.])
else
AC_MSG_CHECKING([for wxrc])
if test "x$WXRC" = x ; then
dnl wx-config --utility is a new addition to wxWidgets:
_WX_PRIVATE_CHECK_VERSION(2,5,3)
Expand All @@ -360,7 +360,7 @@ AC_DEFUN([AM_PATH_WXRC],
AC_MSG_RESULT([$WXRC])
ifelse([$1], , :, [$1])
fi
AC_SUBST(WXRC)
fi
])
1 change: 0 additions & 1 deletion Project/GNU/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,3 @@ package_mediainfo-gui() {
cd "${srcdir}"/MediaInfo/Project/GNU/GUI
make DESTDIR="${pkgdir}" install
}

2 changes: 1 addition & 1 deletion Project/Mac/Make_MI_dmg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ if [ "$KIND" = "GUI" ]; then
sed -i '' -e "s/VERSION/${VERSION}/g" "${FILES}/${APPNAME}.app/Contents/Info.plist"
printf '%s' 'APPL????' > "${FILES}/${APPNAME}.app/Contents/PkgInfo"
cp ${APPNAME}.icns "${FILES}/${APPNAME}.app/Contents/Resources"

codesign -f --deep --options=runtime -s "Developer ID Application: ${SIGNATURE}" --verbose "${FILES}/${APPNAME}.app/Contents/MacOS/${APPNAME}"
codesign -f --deep --options=runtime -s "Developer ID Application: ${SIGNATURE}" --verbose "${FILES}/${APPNAME}.app"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,3 @@ def __init__(self, name, options, project):

def enable_cross_compilation(self):
return

1 change: 0 additions & 1 deletion Project/Snap/mediainfo/snap/plugins/x-autotools-subdir.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,3 @@ def __init__(self, name, options, project):

def enable_cross_compilation(self):
return

10 changes: 5 additions & 5 deletions Project/Solaris/mkpkg
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Home=`pwd`
install_prefix=${Home}/mk_package
packagecreation_prefix=${Home}/create_package
if test -z "${basedir}"; then
basedir="/"
basedir="/"
fi

#Common code
Expand All @@ -26,14 +26,14 @@ cd ../GNU/CLI
./configure --prefix="${install_prefix}" --enable-shared --disable-static $*
make
if test -e mediainfo; then
echo "Compilation OK"
echo "Compilation OK"
else
echo "Compilation problem"
exit 1
echo "Compilation problem"
exit 1
fi

#****************************************************************************
# Release
# Release
#****************************************************************************

cd "${Home}"
Expand Down
4 changes: 0 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ MediaInfo is a convenient unified display of the most relevant technical and tag
[![Build Status](https://travis-ci.org/MediaArea/MediaInfo.svg?branch=master)](https://travis-ci.org/MediaArea/MediaInfo)
[![Build status](https://ci.appveyor.com/api/projects/status/msq8b4fuqfy9jmvr/branch/master?svg=true)](https://ci.appveyor.com/project/MediaArea/mediainfo/branch/master)


# How to build MediaInfo

## Build under macOS and Linux
Expand All @@ -29,7 +28,6 @@ port install autoconf automake libtool pkgconfig zlib wxWidgets-3.0
* [libzen](#zenlib)
* [libmediainfo](#mediainfolib)


### Dependencies under Linux

#### Listing
Expand Down Expand Up @@ -101,7 +99,6 @@ sudo yum install libmediainfo*.rpm libzen*.rpm
sudo yum install wxGTK-devel desktop-file-utils
```


#### Debian

*Build tools and CLI/GUI dependencies*
Expand Down Expand Up @@ -148,7 +145,6 @@ zypper install libqt4-devel libQtWebKit-devel update-desktop-files

### Build MediaInfo CLI


When you have done all the prerequisite for your configuration, then build MediaInfo. We start with the CLI.

```sh
Expand Down
1 change: 0 additions & 1 deletion Source/CLI/CLI_Main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -165,4 +165,3 @@ int main(int argc, char* argv_ansi[])
return MI_ERROR;
}
//---------------------------------------------------------------------------

1 change: 0 additions & 1 deletion Source/CLI/CommandLine_Parser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -231,4 +231,3 @@ void CallBack_Set(Core &MI, void* Event_CallBackFunction)
//CallBack configuration
MI.Menu_Option_Preferences_Option(__T("Event_CallBackFunction"), __T("CallBack=memory://")+ZenLib::Ztring::ToZtring((size_t)Event_CallBackFunction));
}

2 changes: 1 addition & 1 deletion Source/CLI/Help.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ int Help()
TEXTOUT(" Full information Display with XML tags using the older");
TEXTOUT(" MediaInfo schema");
TEXTOUT("--Output=JSON");
TEXTOUT(" Full information Display using JSON");
TEXTOUT(" Full information Display using JSON");
TEXTOUT("--Output=EBUCore");
TEXTOUT(" Full information Display with EBUCore compliant XML tags");
TEXTOUT("--Output=EBUCore_JSON");
Expand Down
8 changes: 3 additions & 5 deletions Source/Common/Preferences.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@ int Preferences::ExplorerShell()
List=__T(
".264;H264File\r\n"
".3g2;mpeg4File\r\n"
".3ga;mpeg4File\r\n"
".3ga;mpeg4File\r\n"
".3gp;mpeg4File\r\n"
".3gpa;mpeg4File\r\n"
".3gpp;mpeg4File\r\n"
Expand Down Expand Up @@ -589,8 +589,8 @@ int Preferences::ExplorerShell()
".dvr-ms;DVRMSFile\r\n"
".eac3;EAC3File\r\n"
".evo;EVOFile\r\n"
".f4a;mpeg4File\r\n"
".f4b;mpeg4File\r\n"
".f4a;mpeg4File\r\n"
".f4b;mpeg4File\r\n"
".f4v;mpeg4File\r\n"
".fla;FLACFile\r\n"
".flc;FLICFile\r\n"
Expand Down Expand Up @@ -1467,5 +1467,3 @@ ZenLib::Ztring &Preferences::Translate(ZenLib::Ztring Name)
else
return Details[Prefs_Language](Pos)(1);
}


1 change: 0 additions & 1 deletion Source/Common/Utils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -173,4 +173,3 @@ void Debug_Header_Create(const ZenLib::Ztring &FileName, void* Handle)
delete [] Tout;
MessageBox(Handle, Prefs->Translate(__T("Send HeaderFile")).c_str(), Prefs->Translate(__T("Header file")).c_str(), 0);
}

1 change: 0 additions & 1 deletion Source/Common/Utilsx.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -118,4 +118,3 @@ void Debug_Header_Create(const ZenLib::Ztring &FileName, void* Handle)
delete [] Tout;
Application->MessageBox(Prefs->Translate(__T("Send HeaderFile")).c_str(), Prefs->Translate(__T("Header file")).c_str());
}

2 changes: 1 addition & 1 deletion Source/Install/MediaInfo_GUI_Windows.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ Function .onInit
SetRegView 64
${EndIf}
!insertmacro MUI_LANGDLL_DISPLAY

; Increment install count
ReadRegDWORD $0 HKCU "${PRODUCT_REGISTRY}" "InstallCount"
IntOp $0 $0 + 1
Expand Down
1 change: 0 additions & 1 deletion Source/PreRelease/WxWidgets/GUI_Main.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,3 @@ class GUI_Main : public wxFrame
wxTextCtrl* Text;
DECLARE_EVENT_TABLE() // any class wishing to process wxWindows events must use this macro
};

0 comments on commit e321a2a

Please sign in to comment.