Browse Source

gui/macosx: use input vars instead of controls

pull/73/head
Thomas Guillem 8 years ago
parent
commit
d900df9ba8
  1. 2
      modules/gui/macosx/VLCControlsBarCommon.m
  2. 2
      modules/gui/macosx/VLCCoreInteraction.m
  3. 3
      modules/gui/macosx/VLCMainMenu.m
  4. 8
      modules/gui/macosx/applescript.m

2
modules/gui/macosx/VLCControlsBarCommon.m

@ -307,7 +307,7 @@
// No duration, disable slider
[self.timeSlider setEnabled:NO];
} else {
input_state_e inputState = input_GetState(p_input);
input_state_e inputState = var_GetInteger(p_input, "state");
bool buffering = (inputState == INIT_S || inputState == OPENING_S);
[self.timeSlider setIndefinite:buffering];
}

2
modules/gui/macosx/VLCCoreInteraction.m

@ -259,7 +259,7 @@ static int BossCallback(vlc_object_t *p_this, const char *psz_var,
if (!p_input)
return i_duration;
input_Control(p_input, INPUT_GET_LENGTH, &i_duration);
i_duration = var_GetInteger(p_input, "length");
vlc_object_release(p_input);
return (i_duration / 1000000);

3
modules/gui/macosx/VLCMainMenu.m

@ -847,7 +847,8 @@
input_thread_t *p_input = pl_CurrentInput(getIntf());
if (p_input) {
input_Control(p_input, INPUT_SET_TIME, vlc_tick_from_sec( returnTime ));
input_SetTime(p_input, vlc_tick_from_sec(returnTime),
var_GetBool(p_input, "input-fast-seek"));
vlc_object_release(p_input);
}
}];

8
modules/gui/macosx/applescript.m

@ -185,8 +185,7 @@
if (!p_input)
return NO;
input_state_e i_state = ERROR_S;
input_Control(p_input, INPUT_GET_STATE, &i_state);
input_state_e i_state = var_GetInteger(p_input, "state");
vlc_object_release(p_input);
return ((i_state == OPENING_S) || (i_state == PLAYING_S));
@ -229,7 +228,7 @@
if (!p_input)
return i_currentTime;
input_Control(p_input, INPUT_GET_TIME, &i_currentTime);
i_currentTime = var_GetInteger(p_input, "time");
vlc_object_release(p_input);
return (int)SEC_FROM_VLC_TICK(i_currentTime);
@ -243,7 +242,8 @@
if (!p_input)
return;
input_Control(p_input, INPUT_SET_TIME, vlc_tick_from_sec( i64_value ));
input_SetTime(p_input, vlc_tick_from_sec(i64_value),
var_GetBool(p_input, "input-fast-seek"));
vlc_object_release(p_input);
}
}

Loading…
Cancel
Save