From fec1d83b55c752f404005f9d340ac4ec1b28c059 Mon Sep 17 00:00:00 2001
From: James Trayford <j.w.trayford@port.ac.uk>
Date: Sat, 7 Dec 2024 12:03:51 +0000
Subject: [PATCH] git push cleanup

---
 .../cubeviz/plugins/sonify_data/sonify_data.py       |  2 +-
 .../cubeviz/plugins/sonify_data/sonify_data.vue      | 12 +-----------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/jdaviz/configs/cubeviz/plugins/sonify_data/sonify_data.py b/jdaviz/configs/cubeviz/plugins/sonify_data/sonify_data.py
index 90a70d91cc..3a7e39a23d 100644
--- a/jdaviz/configs/cubeviz/plugins/sonify_data/sonify_data.py
+++ b/jdaviz/configs/cubeviz/plugins/sonify_data/sonify_data.py
@@ -93,7 +93,7 @@ def vue_sonify_cube(self, *args):
             display_unit = self.spec_viewer.state.x_display_unit
             min_wavelength = self.spectral_subset.selected_obj.lower.to_value(u.Unit(display_unit))
             max_wavelength = self.spectral_subset.selected_obj.upper.to_value(u.Unit(display_unit))
-            self.flux_viewer.update_listener_wls(min_wavelength, max_wavelength, display_unit)
+            self.flux_viewer.update_listener_wls((min_wavelength, max_wavelength), display_unit)
 
         # Ensure the current spectral region bounds are up-to-date at render time
         self.update_wavelength_range(None)
diff --git a/jdaviz/configs/cubeviz/plugins/sonify_data/sonify_data.vue b/jdaviz/configs/cubeviz/plugins/sonify_data/sonify_data.vue
index 5d233022b9..697315b87d 100644
--- a/jdaviz/configs/cubeviz/plugins/sonify_data/sonify_data.vue
+++ b/jdaviz/configs/cubeviz/plugins/sonify_data/sonify_data.vue
@@ -143,10 +143,7 @@
         Stop stream
       </plugin-action-button>
     </v-row>
-<<<<<<< HEAD
-=======
     <j-plugin-section-header>Live Sound Options</j-plugin-section-header>
->>>>>>> 9abf2b3b (sonification plugin options: rearrange, label, defaults.)
     <v-row>
       <v-select
         :menu-props="{ left: true }"
@@ -154,22 +151,15 @@
         :items="sound_devices_items"
         v-model="sound_devices_selected"
         label="Sound device"
-<<<<<<< HEAD
-        hint="Device which sound will be output from. Must be selected BEFORE cube is sonified."
-=======
         hint="Device which sound will be output from."
->>>>>>> 9abf2b3b (sonification plugin options: rearrange, label, defaults.)
         persistent-hint
         ></v-select>
     </v-row>
     <v-row>
         Volume
         <glue-throttled-slider label="Volume" wait="300" max="100" step="1" :value.sync="volume" hide-details class="no-hint" />
-<<<<<<< HEAD
+
     </v-row>
-=======
    </v-row>
-
->>>>>>> 9abf2b3b (sonification plugin options: rearrange, label, defaults.)
  </j-tray-plugin>
 </template>
\ No newline at end of file