Unmap insert mode sounds from auditory#Unmap()

* Move the insert mode autocommand definition into a new function that turns on insert mode sounds * Create a function to turn off insert mode sounds * Call these from our normal `AssignMappings` and `Unmap` functions so we can turn all our sounds on and off in one fell swoop
teddywing · Aug 16, 2015 · a612f8f · a612f8f
1 parent d5b7bd6
commit a612f8f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/autoload/auditory.vim b/autoload/auditory.vim
@@ -76,6 +76,21 @@ function! auditory#PlayScale()
 endfunction
 
 
+function! auditory#AssignInsertMappings()
+	augroup auditory#insert_mode
+		autocmd!
+		autocmd CursorMovedI * call auditory#PlayScale()
+	augroup END
+endfunction
+
+
+function! auditory#UnmapInsert()
+	augroup auditory#insert_mode
+		autocmd!
+	augroup END
+endfunction
+
+
 let s:galaxy_far_far_away_index = 0
 let s:cantina = [
 	\ 'Cantina_1.1.wav',
@@ -485,6 +500,8 @@ function! auditory#AssignMappings()
 			\ l:pipe .
 			\ l:map_to_with_count
 	endfor
+
+	call auditory#AssignInsertMappings()
 endfunction
 
 
@@ -518,4 +535,6 @@ function! auditory#Unmap()
 			execute l:cmd . ' ' . get(value, 'map_from', key) . ' ' . value.user_mapping
 		endif
 	endfor
+
+	call auditory#UnmapInsert()
 endfunction
diff --git a/plugin/auditory.vim b/plugin/auditory.vim
@@ -11,12 +11,6 @@ if !executable('mplayer')
 endif
 
 
-augroup auditory#insert_mode
-	autocmd!
-	autocmd CursorMovedI * call auditory#PlayScale()
-augroup END
-
-
 command! AuditoryToggleGalaxyFarFarAway call auditory#ToggleGalaxyFarFarAway()
 command! AuditoryOff call auditory#Unmap()