fix importing gst. Fixes #8306
This commit is contained in:
parent
9d4b1dd53f
commit
588ead0990
4 changed files with 9 additions and 1 deletions
|
@ -201,7 +201,9 @@ try:
|
||||||
from gi.repository import Farstream
|
from gi.repository import Farstream
|
||||||
gi.require_version('Gst', '1.0')
|
gi.require_version('Gst', '1.0')
|
||||||
from gi.repository import Gst
|
from gi.repository import Gst
|
||||||
|
gi.require_version('GdkX11', '3.0')
|
||||||
from gi.repository import GdkX11
|
from gi.repository import GdkX11
|
||||||
|
gi.require_version('GstVideo', '1.0')
|
||||||
from gi.repository import GstVideo
|
from gi.repository import GstVideo
|
||||||
from gi.repository import GLib
|
from gi.repository import GLib
|
||||||
try:
|
try:
|
||||||
|
|
|
@ -27,7 +27,9 @@ from gi.repository import Farstream
|
||||||
import gi
|
import gi
|
||||||
gi.require_version('Gst', '1.0')
|
gi.require_version('Gst', '1.0')
|
||||||
from gi.repository import Gst
|
from gi.repository import Gst
|
||||||
|
gi.require_version('GdkX11', '3.0')
|
||||||
from gi.repository import GdkX11
|
from gi.repository import GdkX11
|
||||||
|
gi.require_version('GstVideo', '1.0')
|
||||||
from gi.repository import GstVideo
|
from gi.repository import GstVideo
|
||||||
from gi.repository import GLib
|
from gi.repository import GLib
|
||||||
|
|
||||||
|
|
|
@ -13,8 +13,12 @@
|
||||||
## You should have received a copy of the GNU General Public License
|
## You should have received a copy of the GNU General Public License
|
||||||
## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
|
## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
import gi
|
||||||
|
gi.require_version('Gst', '1.0')
|
||||||
from gi.repository import Gst
|
from gi.repository import Gst
|
||||||
|
gi.require_version('GdkX11', '3.0')
|
||||||
from gi.repository import GdkX11
|
from gi.repository import GdkX11
|
||||||
|
gi.require_version('GstVideo', '1.0')
|
||||||
from gi.repository import GstVideo
|
from gi.repository import GstVideo
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -68,7 +68,7 @@ try:
|
||||||
from common.multimedia_helpers import AudioInputManager, AudioOutputManager
|
from common.multimedia_helpers import AudioInputManager, AudioOutputManager
|
||||||
from common.multimedia_helpers import VideoInputManager, VideoOutputManager
|
from common.multimedia_helpers import VideoInputManager, VideoOutputManager
|
||||||
HAS_GST = True
|
HAS_GST = True
|
||||||
except ImportError:
|
except (ImportError, ValueError):
|
||||||
HAS_GST = False
|
HAS_GST = False
|
||||||
|
|
||||||
from common.exceptions import GajimGeneralException
|
from common.exceptions import GajimGeneralException
|
||||||
|
|
Loading…
Add table
Reference in a new issue