Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mergeconflict fix and decompiled again for new Ableton version 11.3.12 #12

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
16 changes: 6 additions & 10 deletions ADVANCE/Advance.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
<<<<<<< HEAD
=======
# decompyle3 version 3.8.0
# Python bytecode 3.7.0 (3394)
# Decompiled from: Python 3.8.9 (default, Mar 30 2022, 13:51:17)
# [Clang 13.1.6 (clang-1316.0.21.2.3)]
# Embedded file name: output/Live/mac_64_static/Release/python-bundle/MIDI Remote Scripts/ADVANCE/Advance.py
# Compiled at: 2022-01-27 16:28:16
# Size of source mod 2**32: 2844 bytes
>>>>>>> d4a7b269eef325b60d6e8b8cc6298fd52c04fa34
# decompyle3 version 3.9.0
# Python bytecode version base 3.7.0 (3394)
# Decompiled from: Python 3.8.0 (tags/v3.8.0:fa919fd, Oct 14 2019, 19:37:50) [MSC v.1916 64 bit (AMD64)]
# Embedded file name: ..\..\..\output\Live\win_64_static\Release\python-bundle\MIDI Remote Scripts\ADVANCE\Advance.py
# Compiled at: 2022-11-29 09:57:02
# Size of source mod 2**32: 2926 bytes
from __future__ import absolute_import, print_function, unicode_literals
from builtins import range
import Live
Expand Down
16 changes: 6 additions & 10 deletions ADVANCE/__init__.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
<<<<<<< HEAD
=======
# decompyle3 version 3.8.0
# Python bytecode 3.7.0 (3394)
# Decompiled from: Python 3.8.9 (default, Mar 30 2022, 13:51:17)
# [Clang 13.1.6 (clang-1316.0.21.2.3)]
# Embedded file name: output/Live/mac_64_static/Release/python-bundle/MIDI Remote Scripts/ADVANCE/__init__.py
# Compiled at: 2021-06-29 09:33:48
# Size of source mod 2**32: 695 bytes
>>>>>>> d4a7b269eef325b60d6e8b8cc6298fd52c04fa34
# decompyle3 version 3.9.0
# Python bytecode version base 3.7.0 (3394)
# Decompiled from: Python 3.8.0 (tags/v3.8.0:fa919fd, Oct 14 2019, 19:37:50) [MSC v.1916 64 bit (AMD64)]
# Embedded file name: ..\..\..\output\Live\win_64_static\Release\python-bundle\MIDI Remote Scripts\ADVANCE\__init__.py
# Compiled at: 2022-11-28 08:01:31
# Size of source mod 2**32: 720 bytes
from __future__ import absolute_import, print_function, unicode_literals
import _Framework.Capabilities as caps
from .Advance import Advance
Expand Down
16 changes: 6 additions & 10 deletions AIRA_MX_1/Colors.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
<<<<<<< HEAD
=======
# decompyle3 version 3.8.0
# Python bytecode 3.7.0 (3394)
# Decompiled from: Python 3.8.9 (default, Mar 30 2022, 13:51:17)
# [Clang 13.1.6 (clang-1316.0.21.2.3)]
# Embedded file name: output/Live/mac_64_static/Release/python-bundle/MIDI Remote Scripts/AIRA_MX_1/Colors.py
# Compiled at: 2022-01-28 05:06:40
# Size of source mod 2**32: 589 bytes
>>>>>>> d4a7b269eef325b60d6e8b8cc6298fd52c04fa34
# decompyle3 version 3.9.0
# Python bytecode version base 3.7.0 (3394)
# Decompiled from: Python 3.8.0 (tags/v3.8.0:fa919fd, Oct 14 2019, 19:37:50) [MSC v.1916 64 bit (AMD64)]
# Embedded file name: ..\..\..\output\Live\win_64_static\Release\python-bundle\MIDI Remote Scripts\AIRA_MX_1\Colors.py
# Compiled at: 2023-10-06 16:20:26
# Size of source mod 2**32: 614 bytes
from __future__ import absolute_import, print_function, unicode_literals
from _Framework.ButtonElement import Color
BLINK_LED_CHANNEL = 14
Expand Down
16 changes: 6 additions & 10 deletions AIRA_MX_1/ControlElementUtils.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
<<<<<<< HEAD
=======
# decompyle3 version 3.8.0
# Python bytecode 3.7.0 (3394)
# Decompiled from: Python 3.8.9 (default, Mar 30 2022, 13:51:17)
# [Clang 13.1.6 (clang-1316.0.21.2.3)]
# Embedded file name: output/Live/mac_64_static/Release/python-bundle/MIDI Remote Scripts/AIRA_MX_1/ControlElementUtils.py
# Compiled at: 2022-01-28 05:06:40
# Size of source mod 2**32: 1170 bytes
>>>>>>> d4a7b269eef325b60d6e8b8cc6298fd52c04fa34
# decompyle3 version 3.9.0
# Python bytecode version base 3.7.0 (3394)
# Decompiled from: Python 3.8.0 (tags/v3.8.0:fa919fd, Oct 14 2019, 19:37:50) [MSC v.1916 64 bit (AMD64)]
# Embedded file name: ..\..\..\output\Live\win_64_static\Release\python-bundle\MIDI Remote Scripts\AIRA_MX_1\ControlElementUtils.py
# Compiled at: 2023-10-06 16:20:26
# Size of source mod 2**32: 1217 bytes
from __future__ import absolute_import, print_function, unicode_literals
import Live
from _Framework.Resource import PrioritizedResource
Expand Down
16 changes: 6 additions & 10 deletions AIRA_MX_1/NotifyingMixerComponent.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
<<<<<<< HEAD
=======
# decompyle3 version 3.8.0
# Python bytecode 3.7.0 (3394)
# Decompiled from: Python 3.8.9 (default, Mar 30 2022, 13:51:17)
# [Clang 13.1.6 (clang-1316.0.21.2.3)]
# Embedded file name: output/Live/mac_64_static/Release/python-bundle/MIDI Remote Scripts/AIRA_MX_1/NotifyingMixerComponent.py
# Compiled at: 2022-01-28 05:06:40
# Size of source mod 2**32: 1293 bytes
>>>>>>> d4a7b269eef325b60d6e8b8cc6298fd52c04fa34
# decompyle3 version 3.9.0
# Python bytecode version base 3.7.0 (3394)
# Decompiled from: Python 3.8.0 (tags/v3.8.0:fa919fd, Oct 14 2019, 19:37:50) [MSC v.1916 64 bit (AMD64)]
# Embedded file name: ..\..\..\output\Live\win_64_static\Release\python-bundle\MIDI Remote Scripts\AIRA_MX_1\NotifyingMixerComponent.py
# Compiled at: 2023-10-06 16:20:26
# Size of source mod 2**32: 1331 bytes
from __future__ import absolute_import, print_function, unicode_literals
import _Framework.MixerComponent as MixerComponent
from _Framework.Control import ButtonControl
Expand Down
25 changes: 7 additions & 18 deletions AIRA_MX_1/NotifyingSessionComponent.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
<<<<<<< HEAD
=======
# decompyle3 version 3.8.0
# Python bytecode 3.7.0 (3394)
# Decompiled from: Python 3.8.9 (default, Mar 30 2022, 13:51:17)
# [Clang 13.1.6 (clang-1316.0.21.2.3)]
# Embedded file name: output/Live/mac_64_static/Release/python-bundle/MIDI Remote Scripts/AIRA_MX_1/NotifyingSessionComponent.py
# Compiled at: 2022-01-28 05:06:40
# Size of source mod 2**32: 4593 bytes
>>>>>>> d4a7b269eef325b60d6e8b8cc6298fd52c04fa34
# decompyle3 version 3.9.0
# Python bytecode version base 3.7.0 (3394)
# Decompiled from: Python 3.8.0 (tags/v3.8.0:fa919fd, Oct 14 2019, 19:37:50) [MSC v.1916 64 bit (AMD64)]
# Embedded file name: ..\..\..\output\Live\win_64_static\Release\python-bundle\MIDI Remote Scripts\AIRA_MX_1\NotifyingSessionComponent.py
# Compiled at: 2023-10-06 16:20:26
# Size of source mod 2**32: 4722 bytes
from __future__ import absolute_import, print_function, unicode_literals
from builtins import range
from future.moves.itertools import zip_longest
Expand All @@ -31,7 +27,7 @@ def set_playing_value(self, value):
self._playing_value = value

def set_scene(self, scene):
if scene != self._scene or (type(self._scene) != type(scene)):
if scene != self._scene or type(self._scene) != type(scene):
self._scene = scene
self._on_is_triggered_changed.subject = scene
self._on_scene_color_changed.subject = scene
Expand All @@ -49,18 +45,11 @@ def _update_launch_button(self):
if self._scene:
if self._has_fired_slots():
value_to_send = self._triggered_value
<<<<<<< HEAD
else:
if self._has_playing_slots():
value_to_send = self._playing_value
else:
value_to_send = self._scene_value
=======
elif self._has_playing_slots():
value_to_send = self._playing_value
else:
value_to_send = self._scene_value
>>>>>>> d4a7b269eef325b60d6e8b8cc6298fd52c04fa34
if value_to_send is None:
self._launch_button.turn_off()
else:
Expand Down
20 changes: 6 additions & 14 deletions AIRA_MX_1/RolandMX1.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
<<<<<<< HEAD
=======
# decompyle3 version 3.8.0
# Python bytecode 3.7.0 (3394)
# Decompiled from: Python 3.8.9 (default, Mar 30 2022, 13:51:17)
# [Clang 13.1.6 (clang-1316.0.21.2.3)]
# Embedded file name: output/Live/mac_64_static/Release/python-bundle/MIDI Remote Scripts/AIRA_MX_1/RolandMX1.py
# Compiled at: 2022-01-28 05:06:40
# Size of source mod 2**32: 5949 bytes
>>>>>>> d4a7b269eef325b60d6e8b8cc6298fd52c04fa34
# decompyle3 version 3.9.0
# Python bytecode version base 3.7.0 (3394)
# Decompiled from: Python 3.8.0 (tags/v3.8.0:fa919fd, Oct 14 2019, 19:37:50) [MSC v.1916 64 bit (AMD64)]
# Embedded file name: ..\..\..\output\Live\win_64_static\Release\python-bundle\MIDI Remote Scripts\AIRA_MX_1\RolandMX1.py
# Compiled at: 2023-10-06 16:20:26
# Size of source mod 2**32: 6126 bytes
from __future__ import absolute_import, print_function, unicode_literals
from builtins import range
from functools import partial
Expand Down Expand Up @@ -69,12 +65,8 @@ def _create_controls(self):
name='MFX_Buttons')

def _create_transport(self):
<<<<<<< HEAD
transport = TransportComponent(play_toggle_model_transform=(lambda v: v
))
=======
transport = TransportComponent(play_toggle_model_transform=(lambda v: v))
>>>>>>> d4a7b269eef325b60d6e8b8cc6298fd52c04fa34
transport.layer = Layer(record_button=(self._modified_start_stop_button),
play_button=(self._start_stop_button))
return transport
Expand Down
16 changes: 6 additions & 10 deletions AIRA_MX_1/SkinDefault.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
<<<<<<< HEAD
=======
# decompyle3 version 3.8.0
# Python bytecode 3.7.0 (3394)
# Decompiled from: Python 3.8.9 (default, Mar 30 2022, 13:51:17)
# [Clang 13.1.6 (clang-1316.0.21.2.3)]
# Embedded file name: output/Live/mac_64_static/Release/python-bundle/MIDI Remote Scripts/AIRA_MX_1/SkinDefault.py
# Compiled at: 2022-01-28 05:06:40
# Size of source mod 2**32: 697 bytes
>>>>>>> d4a7b269eef325b60d6e8b8cc6298fd52c04fa34
# decompyle3 version 3.9.0
# Python bytecode version base 3.7.0 (3394)
# Decompiled from: Python 3.8.0 (tags/v3.8.0:fa919fd, Oct 14 2019, 19:37:50) [MSC v.1916 64 bit (AMD64)]
# Embedded file name: ..\..\..\output\Live\win_64_static\Release\python-bundle\MIDI Remote Scripts\AIRA_MX_1\SkinDefault.py
# Compiled at: 2023-10-06 16:20:26
# Size of source mod 2**32: 724 bytes
from __future__ import absolute_import, print_function, unicode_literals
import _Framework.Skin as Skin
from .Colors import Rgb
Expand Down
16 changes: 6 additions & 10 deletions AIRA_MX_1/__init__.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
<<<<<<< HEAD
=======
# decompyle3 version 3.8.0
# Python bytecode 3.7.0 (3394)
# Decompiled from: Python 3.8.9 (default, Mar 30 2022, 13:51:17)
# [Clang 13.1.6 (clang-1316.0.21.2.3)]
# Embedded file name: output/Live/mac_64_static/Release/python-bundle/MIDI Remote Scripts/AIRA_MX_1/__init__.py
# Compiled at: 2022-01-28 05:06:40
# Size of source mod 2**32: 718 bytes
>>>>>>> d4a7b269eef325b60d6e8b8cc6298fd52c04fa34
# decompyle3 version 3.9.0
# Python bytecode version base 3.7.0 (3394)
# Decompiled from: Python 3.8.0 (tags/v3.8.0:fa919fd, Oct 14 2019, 19:37:50) [MSC v.1916 64 bit (AMD64)]
# Embedded file name: ..\..\..\output\Live\win_64_static\Release\python-bundle\MIDI Remote Scripts\AIRA_MX_1\__init__.py
# Compiled at: 2023-10-06 16:20:26
# Size of source mod 2**32: 750 bytes
from __future__ import absolute_import, print_function, unicode_literals
from _Framework.Capabilities import CONTROLLER_ID_KEY, PORTS_KEY, SCRIPT, controller_id, inport, outport
from .RolandMX1 import RolandMX1
Expand Down
16 changes: 6 additions & 10 deletions APC20/APC20.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
<<<<<<< HEAD
=======
# decompyle3 version 3.8.0
# Python bytecode 3.7.0 (3394)
# Decompiled from: Python 3.8.9 (default, Mar 30 2022, 13:51:17)
# [Clang 13.1.6 (clang-1316.0.21.2.3)]
# Embedded file name: output/Live/mac_64_static/Release/python-bundle/MIDI Remote Scripts/APC20/APC20.py
# Compiled at: 2022-01-27 16:28:16
# Size of source mod 2**32: 7902 bytes
>>>>>>> d4a7b269eef325b60d6e8b8cc6298fd52c04fa34
# decompyle3 version 3.9.0
# Python bytecode version base 3.7.0 (3394)
# Decompiled from: Python 3.8.0 (tags/v3.8.0:fa919fd, Oct 14 2019, 19:37:50) [MSC v.1916 64 bit (AMD64)]
# Embedded file name: ..\..\..\output\Live\win_64_static\Release\python-bundle\MIDI Remote Scripts\APC20\APC20.py
# Compiled at: 2022-11-29 09:57:02
# Size of source mod 2**32: 8132 bytes
from __future__ import absolute_import, print_function, unicode_literals
from builtins import range
from functools import partial
Expand Down
23 changes: 7 additions & 16 deletions APC20/BackgroundComponent.py
Original file line number Diff line number Diff line change
@@ -1,28 +1,19 @@
<<<<<<< HEAD
=======
# decompyle3 version 3.8.0
# Python bytecode 3.7.0 (3394)
# Decompiled from: Python 3.8.9 (default, Mar 30 2022, 13:51:17)
# [Clang 13.1.6 (clang-1316.0.21.2.3)]
# Embedded file name: output/Live/mac_64_static/Release/python-bundle/MIDI Remote Scripts/APC20/BackgroundComponent.py
# Compiled at: 2021-06-29 09:33:48
# Size of source mod 2**32: 595 bytes
>>>>>>> d4a7b269eef325b60d6e8b8cc6298fd52c04fa34
# decompyle3 version 3.9.0
# Python bytecode version base 3.7.0 (3394)
# Decompiled from: Python 3.8.0 (tags/v3.8.0:fa919fd, Oct 14 2019, 19:37:50) [MSC v.1916 64 bit (AMD64)]
# Embedded file name: ..\..\..\output\Live\win_64_static\Release\python-bundle\MIDI Remote Scripts\APC20\BackgroundComponent.py
# Compiled at: 2022-11-28 08:01:31
# Size of source mod 2**32: 611 bytes
from __future__ import absolute_import, print_function, unicode_literals
import _Framework.BackgroundComponent as BackgroundComponentBase
from _Framework.BackgroundComponent import BackgroundComponent as BackgroundComponentBase
from _Framework.Util import nop

class BackgroundComponent(BackgroundComponentBase):

def _clear_control(self, name, control):
if control:
control.add_value_listener(nop)
<<<<<<< HEAD
else:
if name in self._control_map:
self._control_map[name].remove_value_listener(nop)
=======
elif name in self._control_map:
self._control_map[name].remove_value_listener(nop)
>>>>>>> d4a7b269eef325b60d6e8b8cc6298fd52c04fa34
super(BackgroundComponent, self)._clear_control(name, control)
20 changes: 6 additions & 14 deletions APC20/ShiftableSelectorComponent.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
<<<<<<< HEAD
=======
# decompyle3 version 3.8.0
# Python bytecode 3.7.0 (3394)
# Decompiled from: Python 3.8.9 (default, Mar 30 2022, 13:51:17)
# [Clang 13.1.6 (clang-1316.0.21.2.3)]
# Embedded file name: output/Live/mac_64_static/Release/python-bundle/MIDI Remote Scripts/APC20/ShiftableSelectorComponent.py
# Compiled at: 2022-01-27 16:28:16
# Size of source mod 2**32: 8503 bytes
>>>>>>> d4a7b269eef325b60d6e8b8cc6298fd52c04fa34
# decompyle3 version 3.9.0
# Python bytecode version base 3.7.0 (3394)
# Decompiled from: Python 3.8.0 (tags/v3.8.0:fa919fd, Oct 14 2019, 19:37:50) [MSC v.1916 64 bit (AMD64)]
# Embedded file name: ..\..\..\output\Live\win_64_static\Release\python-bundle\MIDI Remote Scripts\APC20\ShiftableSelectorComponent.py
# Compiled at: 2022-11-29 09:57:02
# Size of source mod 2**32: 8745 bytes
from __future__ import absolute_import, print_function, unicode_literals
from builtins import range
import _Framework.Layer as Layer
Expand Down Expand Up @@ -87,7 +83,6 @@ def update(self):
self._set_session_navigation_controls(self._select_buttons[4], self._select_buttons[5], self._select_buttons[6], self._select_buttons[7])
self._on_note_mode_changed()
else:
<<<<<<< HEAD
if self._mode_index == 1:
self._set_transport_controls(None, None, None, None)
self._set_session_navigation_controls(None, None, None, None)
Expand All @@ -98,9 +93,6 @@ def update(self):
self._mixer.master_strip().set_select_button(self._master_button)
else:
pass
=======
pass
>>>>>>> d4a7b269eef325b60d6e8b8cc6298fd52c04fa34
if self._mode_index == int(self._invert_assignment):
self._slider_modes.set_mode_buttons(None)
for index in range(len(self._select_buttons)):
Expand Down
16 changes: 6 additions & 10 deletions APC20/ShiftableZoomingComponent.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
<<<<<<< HEAD
=======
# decompyle3 version 3.8.0
# Python bytecode 3.7.0 (3394)
# Decompiled from: Python 3.8.9 (default, Mar 30 2022, 13:51:17)
# [Clang 13.1.6 (clang-1316.0.21.2.3)]
# Embedded file name: output/Live/mac_64_static/Release/python-bundle/MIDI Remote Scripts/APC20/ShiftableZoomingComponent.py
# Compiled at: 2022-01-27 16:28:16
# Size of source mod 2**32: 3851 bytes
>>>>>>> d4a7b269eef325b60d6e8b8cc6298fd52c04fa34
# decompyle3 version 3.9.0
# Python bytecode version base 3.7.0 (3394)
# Decompiled from: Python 3.8.0 (tags/v3.8.0:fa919fd, Oct 14 2019, 19:37:50) [MSC v.1916 64 bit (AMD64)]
# Embedded file name: ..\..\..\output\Live\win_64_static\Release\python-bundle\MIDI Remote Scripts\APC20\ShiftableZoomingComponent.py
# Compiled at: 2022-11-29 09:57:02
# Size of source mod 2**32: 3962 bytes
from __future__ import absolute_import, division, print_function, unicode_literals
from builtins import range
from past.utils import old_div
Expand Down
16 changes: 6 additions & 10 deletions APC20/SliderModesComponent.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
<<<<<<< HEAD
=======
# decompyle3 version 3.8.0
# Python bytecode 3.7.0 (3394)
# Decompiled from: Python 3.8.9 (default, Mar 30 2022, 13:51:17)
# [Clang 13.1.6 (clang-1316.0.21.2.3)]
# Embedded file name: output/Live/mac_64_static/Release/python-bundle/MIDI Remote Scripts/APC20/SliderModesComponent.py
# Compiled at: 2022-01-27 16:28:16
# Size of source mod 2**32: 2700 bytes
>>>>>>> d4a7b269eef325b60d6e8b8cc6298fd52c04fa34
# decompyle3 version 3.9.0
# Python bytecode version base 3.7.0 (3394)
# Decompiled from: Python 3.8.0 (tags/v3.8.0:fa919fd, Oct 14 2019, 19:37:50) [MSC v.1916 64 bit (AMD64)]
# Embedded file name: ..\..\..\output\Live\win_64_static\Release\python-bundle\MIDI Remote Scripts\APC20\SliderModesComponent.py
# Compiled at: 2022-11-29 09:57:02
# Size of source mod 2**32: 2786 bytes
from __future__ import absolute_import, print_function, unicode_literals
from builtins import range
import _Framework.ButtonElement as ButtonElement
Expand Down
16 changes: 6 additions & 10 deletions APC20/__init__.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
<<<<<<< HEAD
=======
# decompyle3 version 3.8.0
# Python bytecode 3.7.0 (3394)
# Decompiled from: Python 3.8.9 (default, Mar 30 2022, 13:51:17)
# [Clang 13.1.6 (clang-1316.0.21.2.3)]
# Embedded file name: output/Live/mac_64_static/Release/python-bundle/MIDI Remote Scripts/APC20/__init__.py
# Compiled at: 2022-01-27 16:28:16
# Size of source mod 2**32: 739 bytes
>>>>>>> d4a7b269eef325b60d6e8b8cc6298fd52c04fa34
# decompyle3 version 3.9.0
# Python bytecode version base 3.7.0 (3394)
# Decompiled from: Python 3.8.0 (tags/v3.8.0:fa919fd, Oct 14 2019, 19:37:50) [MSC v.1916 64 bit (AMD64)]
# Embedded file name: ..\..\..\output\Live\win_64_static\Release\python-bundle\MIDI Remote Scripts\APC20\__init__.py
# Compiled at: 2022-11-29 09:57:02
# Size of source mod 2**32: 772 bytes
from __future__ import absolute_import, print_function, unicode_literals
from _Framework.Capabilities import CONTROLLER_ID_KEY, NOTES_CC, PORTS_KEY, REMOTE, SCRIPT, controller_id, inport, outport
from .APC20 import APC20
Expand Down
16 changes: 6 additions & 10 deletions APC20/consts.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
<<<<<<< HEAD
=======
# decompyle3 version 3.8.0
# Python bytecode 3.7.0 (3394)
# Decompiled from: Python 3.8.9 (default, Mar 30 2022, 13:51:17)
# [Clang 13.1.6 (clang-1316.0.21.2.3)]
# Embedded file name: output/Live/mac_64_static/Release/python-bundle/MIDI Remote Scripts/APC20/consts.py
# Compiled at: 2021-06-29 09:33:48
# Size of source mod 2**32: 196 bytes
>>>>>>> d4a7b269eef325b60d6e8b8cc6298fd52c04fa34
# decompyle3 version 3.9.0
# Python bytecode version base 3.7.0 (3394)
# Decompiled from: Python 3.8.0 (tags/v3.8.0:fa919fd, Oct 14 2019, 19:37:50) [MSC v.1916 64 bit (AMD64)]
# Embedded file name: ..\..\..\output\Live\win_64_static\Release\python-bundle\MIDI Remote Scripts\APC20\consts.py
# Compiled at: 2022-11-28 08:01:31
# Size of source mod 2**32: 204 bytes
from __future__ import absolute_import, print_function, unicode_literals
MANUFACTURER_ID = 71
ABLETON_MODE = 65
Expand Down
Loading