From cf37ea864a0f4e3779e132ea3e68d4159825692b Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Tue, 28 Oct 2008 20:45:09 +0000
Subject: move get_storage_setting as method in MDV::Draklive::Media

---
 draklive                  | 12 +++---------
 lib/MDV/Draklive/Media.pm |  6 ++++++
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/draklive b/draklive
index 4ed1d1c..70239ba 100755
--- a/draklive
+++ b/draklive
@@ -1022,12 +1022,6 @@ sub list_selected_loopbacks {
        $live->{settings}{pack} ? @{$live->{packs}{$live->{settings}{pack}} || []} : ());
 }
 
-#- mainly for storage-specific subroutines
-sub get_storage_setting {
-    my ($media, $setting) = @_;
-    $storage{$media->{storage}}{$setting};
-}
-
 #- for actions that support an optional boot storage type
 sub get_boot_setting {
     my ($media, $setting, $opts) = @_;
@@ -1037,7 +1031,7 @@ sub get_boot_setting {
 #- for user-customisable media setting, that can override storage setting
 sub get_media_setting {
     my ($media, $setting) = @_;
-    $media->{$setting} || get_storage_setting($media, $setting);
+    $media->{$setting} || $media->get_storage_setting($setting);
 }
 
 sub get_media_fs_module {
@@ -1576,12 +1570,12 @@ sub pipe_subs {
 sub record_onthefly {
     my ($live, $opts) = @_;
 
-    my $record = get_storage_setting($live->{media}, 'record');
+    my $record = $live->{media}->get_storage_setting('record');
     unless ($record) {
         warn "not implemented yet\n";
         return;
     }
-    if (my $create = get_storage_setting($live->{media}, 'record_needs_master') && get_storage_setting($live->{media}, 'create')) {
+    if (my $create = $live->{media}->get_storage_setting('record_needs_master') && $live->{media}->get_storage_setting('create')) {
         local $opts->{onthefly} = 1;
         #- pipe creation step to recording step
         pipe_subs(sub { $create->($live, $opts) },
diff --git a/lib/MDV/Draklive/Media.pm b/lib/MDV/Draklive/Media.pm
index 2845fc8..27eea42 100644
--- a/lib/MDV/Draklive/Media.pm
+++ b/lib/MDV/Draklive/Media.pm
@@ -5,4 +5,10 @@ sub get_initrd_path {
     '/' . $media->{storage} . '/initrd.gz';
 }
 
+#- mainly for storage-specific subroutines
+sub get_storage_setting {
+    my ($media, $setting) = @_;
+    $storage{$media->{storage}}{$setting};
+}
+
 1;
-- 
cgit v1.2.1