Skip to content

Commit efc2bc0

Browse files
syntaxticsugrsyntaxticsugr
authored
Minor Fixes
1 parent afdadf5 commit efc2bc0

8 files changed

+78
-86
lines changed

‎README.md

+26-24
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,49 @@
11
# ViPER4AndroidFXRepack-Presets
22

3-
Largest collection of DDC(.vdc), Kernel(.irs) & Preset(.xml) for ViPER4Android FX 2.7.x
3+
Largest collection of DDC(.vdc), Kernel(.irs) & Preset(.xml) for ViPER4Android FX 2.7.2.x
44

5-
</br>
65
</br>
76

8-
Checkout [ViPER4AndroidFXRepack](https://github.com/syntaxticsugr/ViPER4AndroidFXRepack) - ViPER4AndroidFx Reborn & Repack.
7+
## Full & Lite Release
98

10-
</br>
11-
12-
---
13-
14-
</br>
15-
16-
## Core and Full Version
17-
18-
Since Release 1.5.0, there are two available versions for download.</br>
9+
Since Release 1.1.0, there are two available versions for download.</br>
1910

2011
* **Full** - All `DDC(.vdc)`, `Kernel(.irs)` & `Preset(.xml)` are included.
2112

22-
* **Core** - All `Preset(.xml)` are icluded and only the required `DDC(.vdc)` & `Kernel(.irs)` for the Preset XML's to function properly are included
13+
* **Lite** - All `Preset(.xml)` are icluded but, only the required `DDC(.vdc)` & `Kernel(.irs)` by those `Preset(.xml)` are included.
2314

15+
</br>
2416
</br>
2517

2618
---
2719

2820
</br>
2921

30-
All current available DDC, Kernel & Preset are sourced from [Viper4Android-presets](https://github.com/jadilson12/Viper4Android-presets).
22+
All current available `DDC(.vdc)` & `Kernel(.irs)` are sourced from
23+
- [Viper4Android-presets](https://github.com/jadilson12/Viper4Android-presets)
24+
- [ViPER4AndroidFX Telegram Channel](https://t.me/ViPER4AndroidFX)
25+
26+
All the Duplicate `DDC(.vdc)` & `Kernel(.irs)` have been deleted.
3127

32-
But this dosen't mean they worked from the start.
3328
</br>
34-
DDC & Kernel Files are the same.
29+
30+
`Preset(.xml)` are souced from [Viper4Android-presets](https://github.com/jadilson12/Viper4Android-presets)
31+
32+
But this dosen't mean they worked from the start.
3533
</br>
36-
But all the Preset XML's have been reworked.
34+
All the `Preset(.xml)` have been reworked.
3735

38-
- All the Preset XML's have been renamed to their respective names for ease of use and to avoid any confusion/hassle.
39-
- Few hundred Duplicate Preset XML's have been deleted.
40-
- All the Preset XML's are patched to work on latest ViPER 2.7.x version.
36+
- All the `Preset(.xml)` have been renamed to their respective names for ease of use and to avoid any confusion/hassle.
37+
- All the Duplicate `Preset(.xml)` have been deleted.
38+
- All the `Preset(.xml)` are patched to work on latest ViPER 2.7.2.x version.
4139

4240
</br>
4341

4442
## Patch Information:
4543
- Added missing Tags
46-
- Updated old Key-Value pairs in Speaker XML's
47-
- Values of Master Limiter & Playback Gain Control set to ViPER Defaults for all XML's (Subject To Change In Future)
48-
- Corrected/Normalized values of the following ViPER Features in XML's:
44+
- Updated old Key-Value pairs
45+
- Values of Master Limiter & Playback Gain Control are set to ViPER Defaults for all Presets (Subject To Change In Future)
46+
- Corrected / Normalized values of the following ViPER features:
4947
- Field Surround
5048
- Differential Surround
5149
- Dynamic System
@@ -54,7 +52,7 @@ But all the Preset XML's have been reworked.
5452

5553
</br>
5654

57-
Check `utils` Folder for Python Code and steps involved in Renaming, Patching and more.
55+
Check `utils` Folder for Python Code and Steps involved in Renaming, Patching and more.
5856

5957
</br>
6058

@@ -63,3 +61,7 @@ Check `utils` Folder for Python Code and steps involved in Renaming, Patching an
6361
### Credits
6462

6563
[Jadilson Guedes](https://github.com/jadilson12)
64+
</br>
65+
[ViPER4AndroidFX Telegram Channel](https://t.me/ViPER4AndroidFX)
66+
67+
</br>

‎utils/README.md

+10-15
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,21 @@
11
## How To Use
22

3-
1. Download [Viper4Android-presets](https://github.com/jadilson12/Viper4Android-presets) and Extract on your system
4-
5-
2. Place `utils` Folder from this Repository inside it
6-
7-
3. Execute the following Python scripts in order:
3+
Execute the following Python scripts in order on appropriate Input:
4+
</br>
5+
(Use Output from One Step as Input to the Next Step)
86

9-
1. [rename_xmls.py](https://github.com/syntaxticsugr/ViPER4AndroidFXRepack-Presets/blob/main/utils/rename_xmls.py)
7+
1. [rename_xmls.py](https://github.com/syntaxticsugr/ViPER4AndroidFXRepack-Presets/blob/main/utils/rename_xmls.py)
108

11-
2. [convert_xmls.py](https://github.com/syntaxticsugr/ViPER4AndroidFXRepack-Presets/blob/main/utils/convert_xmls.py)
9+
2. [convert_xmls.py](https://github.com/syntaxticsugr/ViPER4AndroidFXRepack-Presets/blob/main/utils/convert_xmls.py)
1210

13-
3. [remove_duplicates.py](https://github.com/syntaxticsugr/ViPER4AndroidFXRepack-Presets/blob/main/utils/remove_duplicates.py)
11+
3. [remove_duplicates.py](https://github.com/syntaxticsugr/ViPER4AndroidFXRepack-Presets/blob/main/utils/remove_duplicates.py)
1412

15-
4. [reference_fixer.py](https://github.com/syntaxticsugr/ViPER4AndroidFXRepack-Presets/blob/main/utils/reference_fixer.py)
13+
4. [reference_fixer.py](https://github.com/syntaxticsugr/ViPER4AndroidFXRepack-Presets/blob/main/utils/reference_fixer.py)
1614

17-
5. [filter_vdc_irs.py](https://github.com/syntaxticsugr/ViPER4AndroidFXRepack-Presets/blob/main/utils/filter_vdc_irs.py)*
15+
5. [filter_vdc_irs.py](https://github.com/syntaxticsugr/ViPER4AndroidFXRepack-Presets/blob/main/utils/filter_vdc_irs.py)*
1816

19-
</br>
17+
</br>
2018

21-
*For Lite Package
19+
*For Lite Package
2220

2321
</br>
24-
I know the code used for Patching is not very efficient, (waiting for your PR's)
25-
<br>
26-
but, it gets the job done in less than 3 seconds.

‎utils/convert_xmls.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
# Default ID2 XML
2929
# Old XML
3030
# New XML
31-
with open(default_id1_xml_file) as default_id1_xml, open(default_id2_xml_file) as default_id2_xml, open(old_xml_directory + '/' + old_xml_file) as old_xml, open(new_xml_directory + '/' + os.path.basename(old_xml_file), 'w+') as new_xml:
31+
with open(default_id1_xml_file) as default_id1_xml, open(default_id2_xml_file) as default_id2_xml, open(old_xml_directory + '/' + old_xml_file) as old_xml, open(new_xml_directory + '/' + os.path.basename(old_xml_file), 'w') as new_xml:
3232

3333
# Selecting the Appropriate Default XML
3434
# Loading Default XML Content

‎utils/default_id1.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<int name="65563" value="0" />
5050
<int name="65564" value="50" />
5151
<boolean name="65569" value="false" />
52-
<string name="65570;65571;65572"></string>
52+
<string name="65570;65571;65572">100;5600;40;80;50;50</string>
5353
<int name="65573" value="0" />
5454
<boolean name="65583" value="false" />
5555
<boolean name="65574" value="false" />

‎utils/default_id2.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
<boolean name="65610" value="false" />
1212
<int name="65611" value="100" />
1313
<int name="65612" value="100" />
14-
<int name="65613" value="50" />
14+
<int name="65613" value="0" />
1515
<boolean name="65614" value="true" />
16-
<int name="65615" value="45" />
16+
<int name="65615" value="0" />
1717
<boolean name="65616" value="true" />
1818
<int name="65617" value="20" />
1919
<boolean name="65618" value="true" />
2020
<int name="65619" value="50" />
2121
<boolean name="65620" value="true" />
22-
<int name="65621" value="100" />
22+
<int name="65621" value="0" />
2323
<int name="65622" value="80" />
2424
<int name="65623" value="100" />
2525
<int name="65624" value="100" />

‎utils/id1.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969

7070
# Dynamic System
7171
<boolean name="65569" value="false" />
72-
<string name="65570;65571;65572"></string>
72+
<string name="65570;65571;65572">100;5600;40;80;50;50</string>
7373
<int name="65573" value="0" />
7474

7575
# Tube Simulator (6N1J)

‎utils/reference_fixer.py

+34-39
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22

33

44
# Path to Text Files
5-
dup_vdc_txt_file = r''
6-
dup_irs_txt_file = r''
5+
dup_vdc_txt_file = r'/home/adity/Downloads/Viper4Android-presets-4a-2.7-Clean/utils/dup_vdc.txt'
6+
dup_irs_txt_file = r'/home/adity/Downloads/Viper4Android-presets-4a-2.7-Clean/utils/dup_irs.txt'
77

88
# Path to XML's Directory
9-
preset_xml_directory = r''
9+
preset_xml_directory = r'/home/adity/Downloads/Viper4Android-presets-4a-2.7-Clean/U-Preset'
10+
1011

1112
# Loading List of XML's
1213
preset_xml_files = os.listdir(preset_xml_directory)
@@ -22,29 +23,26 @@
2223
# Getting Entries in Log Text file
2324
content = dup_vdc_txt.readlines()
2425

25-
# Looping through Each entry
26-
for n in range(0, len(content), 3):
27-
28-
# Looping though Each XML file
29-
for preset_xml_file in preset_xml_files:
26+
# Looping though Each XML file
27+
for preset_xml_file in preset_xml_files:
3028

31-
# Getting XML data
32-
with open(preset_xml_directory + '/' + preset_xml_file, 'r') as file :
33-
filedata = file.read()
29+
# Getting XML data
30+
with open(preset_xml_directory + '/' + preset_xml_file) as file :
31+
filedata = file.read()
3432

35-
# Updating XML dta
36-
filedata = filedata.replace(content[n].strip().replace("&", "&amp;"), content[n+1].strip().replace("&", "&amp;"))
33+
# Looping through Each Entry in Log Text file
34+
for n in range(0, len(content), 3):
3735

38-
# Rewriting New Data in XML
39-
with open(preset_xml_directory + '/' + preset_xml_file, 'w') as file:
40-
file.write(filedata)
36+
# Updating XML dta
37+
filedata = filedata.replace(content[n].strip().replace("&", "&amp;"), content[n+1].strip().replace("&", "&amp;"))
4138

42-
# Printing Number of Remaining XML's to Process
43-
count-=1
44-
print("Remaining: ", count)
39+
# Rewriting New Data in XML
40+
with open(preset_xml_directory + '/' + preset_xml_file, 'w') as file:
41+
file.write(filedata)
4542

46-
# Resetting to Orignal Count
47-
count = len(preset_xml_files)
43+
# Printing Number of Remaining XML's to Process
44+
count-=1
45+
print("{VDC} Remaining: ", count)
4846

4947

5048
# Total Number XML's
@@ -57,26 +55,23 @@
5755
# Getting Entries in Log Text file
5856
content = dup_irs_txt.readlines()
5957

60-
# Looping through Each entry
61-
for n in range(0, len(content), 3):
62-
63-
# Looping though Each XML file
64-
for preset_xml_file in preset_xml_files:
58+
# Looping though Each XML file
59+
for preset_xml_file in preset_xml_files:
6560

66-
# Getting XML data
67-
with open(preset_xml_directory + '/' + preset_xml_file, 'r') as file :
68-
filedata = file.read()
61+
# Getting XML data
62+
with open(preset_xml_directory + '/' + preset_xml_file) as file :
63+
filedata = file.read()
6964

70-
# Updating XML dta
71-
filedata = filedata.replace(content[n].strip().replace("&", "&amp;"), content[n+1].strip().replace("&", "&amp;"))
65+
# Looping through Each Entry in Log Text file
66+
for n in range(0, len(content), 3):
7267

73-
# Rewriting New Data in XML
74-
with open(preset_xml_directory + '/' + preset_xml_file, 'w') as file:
75-
file.write(filedata)
68+
# Updating XML dta
69+
filedata = filedata.replace(content[n].strip().replace("&", "&amp;"), content[n+1].strip().replace("&", "&amp;"))
7670

77-
# Printing Number of Remaining XML's to Process
78-
count-=1
79-
print("Remaining: ", count)
71+
# Rewriting New Data in XML
72+
with open(preset_xml_directory + '/' + preset_xml_file, 'w') as file:
73+
file.write(filedata)
8074

81-
# Resetting to Orignal Count
82-
count = len(preset_xml_files)
75+
# Printing Number of Remaining XML's to Process
76+
count-=1
77+
print("{IRS} Remaining: ", count)

‎utils/remove_duplicates.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -96,15 +96,15 @@ def check_for_duplicates(paths):
9696

9797
if (".vdc" in os.path.basename(filename)):
9898
# Collecting Duplicate File Names In Respective Text File
99-
dup_vdc_txt.write("{}\n{}\n".format(os.path.basename(filename), os.path.basename(duplicate)))
99+
dup_vdc_txt.write("{}\n{}\n\n".format(os.path.basename(filename), os.path.basename(duplicate)))
100100
# Deleting Duplicate VDC's
101101
try:
102102
os.remove(filename)
103103
except: pass
104104

105105
if (".irs" in os.path.basename(filename)):
106106
# Collecting Duplicate File Names In Respective Text File
107-
dup_irs_txt.write("{}\n{}\n".format(os.path.basename(filename), os.path.basename(duplicate)))
107+
dup_irs_txt.write("{}\n{}\n\n".format(os.path.basename(filename), os.path.basename(duplicate)))
108108
# Deleting Duplicate IRS's
109109
try:
110110
os.remove(filename)

0 commit comments

Comments
 (0)