[pitivi] project settings: Adding custom framerate in framerate combo



commit 326e1c669c85a7e8079d9f7f034e399ddd0c5d63
Author: Ayush Mittal <ayush mittal9398 gmail com>
Date:   Sun May 10 15:59:22 2020 +0530

    project settings: Adding custom framerate in framerate combo

 pitivi/project.py  | 10 ++++++----
 pitivi/render.py   |  3 +--
 pitivi/utils/ui.py |  1 -
 3 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/pitivi/project.py b/pitivi/project.py
index bd629d24..24706043 100644
--- a/pitivi/project.py
+++ b/pitivi/project.py
@@ -60,7 +60,7 @@ from pitivi.utils.ripple_update_group import RippleUpdateGroup
 from pitivi.utils.ui import AUDIO_CHANNELS
 from pitivi.utils.ui import AUDIO_RATES
 from pitivi.utils.ui import beautify_time_delta
-from pitivi.utils.ui import FRAME_RATES
+from pitivi.utils.ui import create_frame_rates_model
 from pitivi.utils.ui import get_combo_value
 from pitivi.utils.ui import set_combo_value
 from pitivi.utils.ui import SPACING
@@ -2075,7 +2075,6 @@ class ProjectSettingsDialog:
         self.frame_rate_fraction_widget.show()
 
         # Populate comboboxes.
-        self.frame_rate_combo.set_model(FRAME_RATES)
         self.channels_combo.set_model(AUDIO_CHANNELS)
         self.sample_rate_combo.set_model(AUDIO_RATES)
 
@@ -2172,8 +2171,11 @@ class ProjectSettingsDialog:
 
     def _update_frame_rate_combo_func(self, unused, combo_widget, fraction_widget):
         """Updates the combo_widget to match the fraction_widget."""
-        # This can fail when there is no corresponding value in combo's model.
-        set_combo_value(combo_widget, fraction_widget.get_widget_value())
+        widget_value = fraction_widget.get_widget_value()
+        fr_datum = (widget_value.num, widget_value.denom)
+        model = create_frame_rates_model(fr_datum)
+        self.frame_rate_combo.set_model(model)
+        set_combo_value(combo_widget, widget_value)
 
     def __video_preset_loaded_cb(self, unused_mgr):
         self.sar = self.get_sar()
diff --git a/pitivi/render.py b/pitivi/render.py
index ef72a2c1..3de26887 100644
--- a/pitivi/render.py
+++ b/pitivi/render.py
@@ -38,7 +38,6 @@ from pitivi.utils.ui import AUDIO_CHANNELS
 from pitivi.utils.ui import AUDIO_RATES
 from pitivi.utils.ui import beautify_eta
 from pitivi.utils.ui import create_frame_rates_model
-from pitivi.utils.ui import FRAME_RATES
 from pitivi.utils.ui import get_combo_value
 from pitivi.utils.ui import set_combo_value
 from pitivi.utils.widgets import GstElementSettingsDialog
@@ -549,7 +548,7 @@ class RenderDialog(Loggable):
         self.audio_settings_button = builder.get_object(
             "audio_settings_button")
         self.frame_rate_combo = builder.get_object("frame_rate_combo")
-        self.frame_rate_combo.set_model(FRAME_RATES)
+        self.frame_rate_combo.set_model(create_frame_rates_model())
         self.scale_spinbutton = builder.get_object("scale_spinbutton")
         self.channels_combo = builder.get_object("channels_combo")
         self.channels_combo.set_model(AUDIO_CHANNELS)
diff --git a/pitivi/utils/ui.py b/pitivi/utils/ui.py
index 24e9f25b..10e90874 100644
--- a/pitivi/utils/ui.py
+++ b/pitivi/utils/ui.py
@@ -879,7 +879,6 @@ standard_frames_list = [(12, 1),
                         (60, 1),
                         (120, 1)
                         ]
-FRAME_RATES = create_frame_rates_model()
 
 AUDIO_RATES = create_model((str, int),
                            [(format_audiorate(rate), rate) for rate in (


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]