Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Grab DISPLAY from environment #23

Merged
merged 1 commit into from Sep 16, 2016
Merged

Grab DISPLAY from environment #23

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion castawesome.py
View file
Open in desktop
Expand Up @@ -782,7 +782,7 @@ def stream(self):
"'overlay=%(web_placement)s,format=yuv420p[out]' -map '[out]' "
command = \
'avconv -f x11grab -show_region %(show_region)s -s %(inres)s '\
+ '-framerate " %(fps)s" -i :0.0+%(x_offset)s,%(y_offset)s '
+ '-framerate " %(fps)s" -i %(display)+%(x_offset)s,%(y_offset)s '
if self.settings.webcam:
command = command + \
'-f video4linux2 -video_size %(web_resolution)s '\
Expand Down Expand Up @@ -972,6 +972,7 @@ class Settings:
webcam_placement = "0:0" # Placement of the webcam overlay
webcam_resolution = "320x200" # Resolution of the webcam
service = "rtmp://live.twitch.tv/app/" # The streaming service in use
display = os.environ.get('DISPLAY', ':0.0') # The X display

def __init__(self, builder):
try:
Expand Down