Compare commits
2 Commits
ebb4d7102b
...
38016be3d3
Author | SHA1 | Date |
---|---|---|
filifa | 38016be3d3 | |
filifa | d13abec803 |
|
@ -27,6 +27,9 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
var transition bool
|
var transition bool
|
||||||
|
var softCutDuration float64
|
||||||
|
var width int32
|
||||||
|
var height int32
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* checkStdin checks if any data has been passed in through stdin and returns
|
* checkStdin checks if any data has been passed in through stdin and returns
|
||||||
|
@ -156,7 +159,7 @@ func milkbucket(cmd *cobra.Command, args []string) {
|
||||||
}
|
}
|
||||||
defer sdl.Quit()
|
defer sdl.Quit()
|
||||||
|
|
||||||
m, err := newMilkDropWindow(800, 600, args)
|
m, err := newMilkDropWindow(width, height, args, softCutDuration)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
cobra.CheckErr(err)
|
cobra.CheckErr(err)
|
||||||
}
|
}
|
||||||
|
@ -203,4 +206,7 @@ func init() {
|
||||||
// Cobra also supports local flags, which will only run
|
// Cobra also supports local flags, which will only run
|
||||||
// when this action is called directly.
|
// when this action is called directly.
|
||||||
rootCmd.Flags().BoolVarP(&transition, "transition", "t", false, "smoothly transition between presets")
|
rootCmd.Flags().BoolVarP(&transition, "transition", "t", false, "smoothly transition between presets")
|
||||||
|
rootCmd.Flags().Float64VarP(&softCutDuration, "soft-cut-duration", "s", 3, "time in seconds for a soft transition between two presets (use with --transition)")
|
||||||
|
rootCmd.Flags().Int32Var(&width, "width", 800, "window width")
|
||||||
|
rootCmd.Flags().Int32Var(&height, "height", 600, "window height")
|
||||||
}
|
}
|
||||||
|
|
|
@ -88,7 +88,7 @@ func (m *milkDropWindow) prevPreset(smooth bool) {
|
||||||
* newMilkDropWindow returns a new milkDropWindow with the given width and
|
* newMilkDropWindow returns a new milkDropWindow with the given width and
|
||||||
* height, and sets presets available to the window.
|
* height, and sets presets available to the window.
|
||||||
*/
|
*/
|
||||||
func newMilkDropWindow(width, height int32, presets []string) (*milkDropWindow, error) {
|
func newMilkDropWindow(width, height int32, presets []string, softCutDuration float64) (*milkDropWindow, error) {
|
||||||
var m milkDropWindow
|
var m milkDropWindow
|
||||||
var err error
|
var err error
|
||||||
|
|
||||||
|
@ -111,6 +111,8 @@ func newMilkDropWindow(width, height int32, presets []string) (*milkDropWindow,
|
||||||
|
|
||||||
C.projectm_set_window_size(m.handle, C.ulong(width), C.ulong(height))
|
C.projectm_set_window_size(m.handle, C.ulong(width), C.ulong(height))
|
||||||
|
|
||||||
|
C.projectm_set_soft_cut_duration(m.handle, C.double(softCutDuration))
|
||||||
|
|
||||||
return &m, nil
|
return &m, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue